| #
7a9f8f93
|
| 28-Oct-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
90890687
|
| 28-Oct-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
ec329a13
|
| 24-Oct-2005 |
Roland Dreier <rolandd@cisco.com> |
Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)
|
| #
e7d311da
|
| 24-Oct-2005 |
Roland Dreier <rolandd@cisco.com> |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
98599013
|
| 22-Oct-2005 |
Paul Mackerras <paulus@samba.org> |
Merge changes from linux-2.6 by hand
|
| #
e78a57de
|
| 22-Oct-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'upstream'
|
| #
ab27642b
|
| 21-Oct-2005 |
Trond Myklebust <Trond.Myklebust@netapp.com> |
Merge branch 'master' of ssh://rsync.linux-nfs.org/home/trondmy/www_sites/rsync.linux-nfs.org/pub/linux/nfs-2.6
|
| #
9cec58dc
|
| 20-Oct-2005 |
Tony Luck <tony.luck@intel.com> |
Update from upstream with manual merge of Yasunori Goto's
changes to swiotlb.c made in commit 281dd25cdc0d6903929b79183816d151ea626341
since this file has been moved from arch/ia64/lib/swiotlb.c to
l
Update from upstream with manual merge of Yasunori Goto's
changes to swiotlb.c made in commit 281dd25cdc0d6903929b79183816d151ea626341
since this file has been moved from arch/ia64/lib/swiotlb.c to
lib/swiotlb.c
Signed-off-by: Tony Luck <tony.luck@intel.com>
show more ...
|
| #
323cb3ce
|
| 20-Oct-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
902f9073
|
| 20-Oct-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
312f5726
|
| 20-Oct-2005 |
Dave Airlie <airlied@starflyer.(none)> |
merge Linus head tree into my drm tree and fix up conflicts
|
| #
e087a412
|
| 19-Oct-2005 |
Anton Altaparmakov <aia21@cantab.net> |
Merge branch 'master' of /usr/src/ntfs-2.6/
|
| #
cb1f7be7
|
| 18-Oct-2005 |
Trond Myklebust <Trond.Myklebust@netapp.com> |
Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
|
| #
1e65174a
|
| 18-Oct-2005 |
Linus Torvalds <torvalds@g5.osdl.org> |
Add some basic .gitignore files
This still leaves driver and architecture-specific subdirectories alone,
but gets rid of the bulk of the "generic" generated files that we should
ignore.
Signed-off-
Add some basic .gitignore files
This still leaves driver and architecture-specific subdirectories alone,
but gets rid of the bulk of the "generic" generated files that we should
ignore.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|