| #
0a75c23a |
| 05-Jan-2006 |
Jody McIntyre <scjody@modernduck.com> |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
| #
25c862cc |
| 05-Jan-2006 |
Linus Torvalds <torvalds@g5.osdl.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
|
|
Revision tags: v2.6.15 |
|
| #
42f122c8 |
| 28-Dec-2005 |
Brian Gerst <bgerst@didntduck.org> |
gitignore: asm-offsets.h
Ignore asm-offsets.h for all arches.
Signed-off-by: Brian Gerst <bgerst@didntduck.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
|
|
Revision tags: v2.6.15-rc7, v2.6.15-rc6 |
|
| #
3d5271f9 |
| 06-Dec-2005 |
Len Brown <len.brown@intel.com> |
Pull release into acpica branch
|
|
Revision tags: v2.6.15-rc5, v2.6.15-rc4, v2.6.15-rc3, v2.6.15-rc2, v2.6.15-rc1 |
|
| #
2fc29911 |
| 06-Nov-2005 |
Thomas Gleixner <tglx@mtd.linutronix.de> |
Merge branch 'master' of /home/tglx/work/mtd/git/linux-2.6.git/
|
| #
35ebbae2 |
| 28-Oct-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
15dbb5a3 |
| 28-Oct-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
7a9f8f93 |
| 28-Oct-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
90890687 |
| 28-Oct-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
|
Revision tags: v2.6.14 |
|
| #
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
|
|
Revision tags: v2.6.14-rc5 |
|
| #
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 ...
|