#
038b0a6d |
| 04-Oct-2006 |
Dave Jones <davej@redhat.com> |
Remove all inclusions of <linux/config.h> kbuild explicitly includes this at build time.
Signed-off-by: Dave Jones <davej@redhat.com>
|
#
8a84fc15 |
| 01-Oct-2006 |
David Woodhouse <dwmw2@infradead.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Manually resolve conflict in include/mtd/Kbuild
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
|
#
185a257f |
| 28-Sep-2006 |
Steven Whitehouse <swhiteho@redhat.com> |
Merge branch 'master' into gfs2
|
#
3b9f6cb8 |
| 28-Sep-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'master' into upstream
|
#
aebb1153 |
| 28-Sep-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'master' into upstream
|
#
db9d988e |
| 27-Sep-2006 |
Jeff Dike <jdike@addtoit.com> |
[PATCH] uml: add an export
Some modules need strnlen_user_skas.
Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osd
[PATCH] uml: add an export
Some modules need strnlen_user_skas.
Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
#
0915ee38 |
| 27-Sep-2006 |
Jeff Dike <jdike@addtoit.com> |
[PATCH] uml: mark some tt-mode code
Mark a symbol and file as being tt-mode only. This shrinks the binary slightly when tt mode support is compiled out and makes it easier to identity stuff when tt
[PATCH] uml: mark some tt-mode code
Mark a symbol and file as being tt-mode only. This shrinks the binary slightly when tt mode support is compiled out and makes it easier to identity stuff when tt mode is removed.
Signed-off-by: Jeff Dike <jdike@addtoit.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
Revision tags: v2.6.18 |
|
#
0612ec48 |
| 19-Sep-2006 |
Dmitry Torokhov <dtor@insightbb.com> |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
#
9b4f2e95 |
| 17-Sep-2006 |
Stefan Richter <stefanr@s5r6.in-berlin.de> |
ieee1394: merge from Linus
Conflicts: drivers/ieee1394/hosts.c Patch "lockdep: annotate ieee1394 skb-queue-head locking" was meddling with patch "ieee1394: fix kerneldoc of hpsb_alloc_host".
Signed
ieee1394: merge from Linus
Conflicts: drivers/ieee1394/hosts.c Patch "lockdep: annotate ieee1394 skb-queue-head locking" was meddling with patch "ieee1394: fix kerneldoc of hpsb_alloc_host".
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
show more ...
|
Revision tags: v2.6.18-rc7, v2.6.18-rc6 |
|
#
0a7d5f8c |
| 31-Aug-2006 |
David Woodhouse <dwmw2@infradead.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
Revision tags: v2.6.18-rc5, v2.6.18-rc4 |
|
#
d932cb7e |
| 05-Aug-2006 |
Dmitry Torokhov <dtor@insightbb.com> |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
|
#
57cad808 |
| 01-Aug-2006 |
Paul Mackerras <paulus@samba.org> |
Merge branch 'merge'
|
Revision tags: v2.6.18-rc3 |
|
#
20f99dcf |
| 27-Jul-2006 |
John W. Linville <linville@tuxdriver.com> |
Merge branch 'from-linus' into upstream
|
#
4bf311dd |
| 17-Jul-2006 |
Steven Whitehouse <swhiteho@redhat.com> |
Merge branch 'master'
|
Revision tags: v2.6.18-rc2 |
|
#
8633c233 |
| 10-Jul-2006 |
Jeff Dike <jdike@addtoit.com> |
[PATCH] uml: remove some useless exports
Spotted by Al Viro - eliminate a couple useless exports.
Signed-off-by: Jeff Dike <jdike@addtoit.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo
[PATCH] uml: remove some useless exports
Spotted by Al Viro - eliminate a couple useless exports.
Signed-off-by: Jeff Dike <jdike@addtoit.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
Revision tags: v2.6.18-rc1, v2.6.17, v2.6.17-rc6, v2.6.17-rc5, v2.6.17-rc4 |
|
#
7b7e3941 |
| 29-Apr-2006 |
Dmitry Torokhov <dtor_core@ameritech.net> |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
Revision tags: v2.6.17-rc3 |
|
#
a748422e |
| 21-Apr-2006 |
Steven Whitehouse <swhiteho@redhat.com> |
Merge branch 'master'
|
Revision tags: v2.6.17-rc2 |
|
#
f1f76afd |
| 19-Apr-2006 |
Dave Jones <davej@redhat.com> |
Merge ../linus
|
#
32ea89ec |
| 12-Apr-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'master'
|
#
a890b15c |
| 12-Apr-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'upstream'
|
#
875999c5 |
| 12-Apr-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'upstream'
|
#
10a5fd5e |
| 11-Apr-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'master'
Conflicts:
drivers/scsi/libata-scsi.c include/linux/libata.h
|
#
7c45ad16 |
| 11-Apr-2006 |
Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> |
[PATCH] uml: fix some double export warnings
Some functions are exported twice in current code - remove the excess export.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Cc:
[PATCH] uml: fix some double export warnings
Some functions are exported twice in current code - remove the excess export.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Cc: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
Revision tags: v2.6.17-rc1, v2.6.16, v2.6.16-rc6, v2.6.16-rc5, v2.6.16-rc4, v2.6.16-rc3, v2.6.16-rc2, v2.6.16-rc1, v2.6.15, 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 |
|
#
a9931a6e |
| 18-Nov-2005 |
Jody McIntyre <scjody@modernduck.com> |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|