|
Revision tags: v2.6.21-rc3, v2.6.21-rc2, v2.6.21-rc1 |
|
| #
b22364c8 |
| 10-Feb-2007 |
Dmitry Torokhov <dtor@insightbb.com> |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
d5112a4f |
| 08-Feb-2007 |
Paul Mackerras <paulus@samba.org> |
Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.21
|
| #
84232005 |
| 07-Feb-2007 |
Paul Mackerras <paulus@samba.org> |
Merge branch 'linux-2.6'
|
| #
4285431f |
| 05-Feb-2007 |
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.20 |
|
| #
30716e07 |
| 31-Jan-2007 |
James Bottomley <jejb@mulgrave.il.steeleye.com> |
Merge branch 'linus'
|
|
Revision tags: v2.6.20-rc7 |
|
| #
89eb1693 |
| 30-Jan-2007 |
Al Viro <viro@ftp.linux.org.uk> |
[PATCH] missing exports of pm_power_off() on alpha and sparc32
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
|
Revision tags: v2.6.20-rc6, v2.6.20-rc5, v2.6.20-rc4, v2.6.20-rc3, v2.6.20-rc2, v2.6.20-rc1, v2.6.19, v2.6.19-rc6, v2.6.19-rc5, v2.6.19-rc4, v2.6.19-rc3, v2.6.19-rc2, v2.6.19-rc1, v2.6.18, v2.6.18-rc7, v2.6.18-rc6, v2.6.18-rc5, v2.6.18-rc4, v2.6.18-rc3, v2.6.18-rc2, v2.6.18-rc1 |
|
| #
05668381 |
| 03-Jul-2006 |
Sam Ravnborg <sam@mars.ravnborg.org> |
Merge branch 'master' of /home/sam/kernel/linux-2.6/
|
| #
026477c1 |
| 03-Jul-2006 |
Trond Myklebust <Trond.Myklebust@netapp.com> |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
|
| #
0a1340c1 |
| 03-Jul-2006 |
Steven Whitehouse <swhiteho@redhat.com> |
Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/linux/kernel.h
|
| #
22a3e233 |
| 01-Jul-2006 |
Linus Torvalds <torvalds@g5.osdl.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
Remove obsolete #include <linux/config.h>
remove obsolete swsusp_en
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
Remove obsolete #include <linux/config.h>
remove obsolete swsusp_encrypt
arch/arm26/Kconfig typos
Documentation/IPMI typos
Kconfig: Typos in net/sched/Kconfig
v9fs: do not include linux/version.h
Documentation/DocBook/mtdnand.tmpl: typo fixes
typo fixes: specfic -> specific
typo fixes in Documentation/networking/pktgen.txt
typo fixes: occuring -> occurring
typo fixes: infomation -> information
typo fixes: disadvantadge -> disadvantage
typo fixes: aquire -> acquire
typo fixes: mecanism -> mechanism
typo fixes: bandwith -> bandwidth
fix a typo in the RTC_CLASS help text
smb is no longer maintained
Manually merged trivial conflict in arch/um/kernel/vmlinux.lds.S
show more ...
|
| #
6ab3d562 |
| 30-Jun-2006 |
Jörn Engel <joern@wohnheim.fh-wedel.de> |
Remove obsolete #include <linux/config.h>
Signed-off-by: Jörn Engel <joern@wohnheim.fh-wedel.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
|
|
Revision tags: v2.6.17, v2.6.17-rc6, v2.6.17-rc5, v2.6.17-rc4, v2.6.17-rc3, v2.6.17-rc2, v2.6.17-rc1 |
|
| #
b0500577 |
| 21-Mar-2006 |
Linus Torvalds <torvalds@g5.osdl.org> |
Merge branch 'origin'
Conflicts:
Documentation/video4linux/CARDLIST.cx88
drivers/media/video/cx88/Kconfig
drivers/media/video/em28xx/em28xx-video.c
drivers/media/video/saa7134/saa7134-dvb.c
Res
Merge branch 'origin'
Conflicts:
Documentation/video4linux/CARDLIST.cx88
drivers/media/video/cx88/Kconfig
drivers/media/video/em28xx/em28xx-video.c
drivers/media/video/saa7134/saa7134-dvb.c
Resolved as in the original merge by Mauro Carvalho Chehab
show more ...
|
| #
0f76ee45 |
| 20-Mar-2006 |
Adrian Bunk <bunk@r063144.stusta.swh.mhn.de> |
Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
|
Revision tags: v2.6.16 |
|
| #
c5111f50 |
| 15-Mar-2006 |
Dave Kleikamp <shaggy@austin.ibm.com> |
Merge with /home/shaggy/git/linus-clean/
|
|
Revision tags: v2.6.16-rc6, v2.6.16-rc5 |
|
| #
fab8d6dd |
| 24-Feb-2006 |
Anton Altaparmakov <aia21@cantab.net> |
Merge branch 'master' of /home/src/linux-2.6/
|
| #
d35462b4 |
| 23-Feb-2006 |
Steven Whitehouse <steve@men-an-tol.chygwyn.com> |
Merge branch 'master'
|
|
Revision tags: v2.6.16-rc4, v2.6.16-rc3 |
|
| #
b580513e |
| 10-Feb-2006 |
Steve French <sfrench@us.ibm.com> |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
|
| #
d6d93856 |
| 10-Feb-2006 |
Paul Mackerras <paulus@samba.org> |
Merge ../powerpc-merge
|
| #
70c07e02 |
| 09-Feb-2006 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'viro'
|
| #
9caafa6c |
| 09-Feb-2006 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'upstream-fixes'
|
| #
99b3738f |
| 09-Feb-2006 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'upstream'
|
| #
725b2805 |
| 09-Feb-2006 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'upstream-fixes'
|
| #
cac0e8e8 |
| 09-Feb-2006 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
|
Revision tags: v2.6.16-rc2 |
|
| #
304cd3ef |
| 19-Jan-2006 |
Al Viro <viro@zeniv.linux.org.uk> |
[PATCH] restore power-off on sparc32
Damn you, Eric
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
|
| #
292dd876 |
| 27-Jan-2006 |
Len Brown <len.brown@intel.com> |
Pull release into acpica branch
|