|
Revision tags: v2.6.18-rc1, 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'
|
| #
ac171c46 |
| 08-Feb-2006 |
Benjamin Herrenschmidt <benh@kernel.crashing.org> |
[PATCH] powerpc: Thermal control for dual core G5s
This patch adds a windfarm module, windfarm_pm112, for the dual core G5s
(both 2 and 4 core models), keeping the machine from getting into
vacuum-c
[PATCH] powerpc: Thermal control for dual core G5s
This patch adds a windfarm module, windfarm_pm112, for the dual core G5s
(both 2 and 4 core models), keeping the machine from getting into
vacuum-cleaner mode ;) For proper credits, the patch was initially
written by Paul Mackerras, and slightly reworked by me to add overtemp
handling among others. The patch also removes the sysfs attributes from
windfarm_pm81 and windfarm_pm91 and instead adds code to the windfarm
core to automagically expose attributes for sensor & controls.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
|
Revision tags: v2.6.16-rc2 |
|
| #
292dd876 |
| 27-Jan-2006 |
Len Brown <len.brown@intel.com> |
Pull release into acpica branch
|
| #
0a0fc0dd |
| 24-Jan-2006 |
Dave Kleikamp <shaggy@austin.ibm.com> |
Merge with /home/shaggy/git/linus-clean/
|
| #
944d7955 |
| 19-Jan-2006 |
Anton Altaparmakov <aia21@cantab.net> |
Merge branch 'master' of /usr/src/ntfs-2.6/
|
| #
ea9b395f |
| 17-Jan-2006 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'upstream'
|
| #
0825788f |
| 17-Jan-2006 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'upstream'
|
|
Revision tags: v2.6.16-rc1 |
|
| #
94bc2be3 |
| 12-Jan-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>
|
| #
0a3a98f6 |
| 09-Jan-2006 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge Linus' tree.
|
| #
de25968c |
| 08-Jan-2006 |
Tim Schmielau <tim@physik3.uni-rostock.de> |
[PATCH] fix more missing includes
Include fixes for 2.6.14-git11. Should allow to remove sched.h from
module.h on i386, x86_64, arm, ia64, ppc, ppc64, and s390. Probably more
to come since I haven
[PATCH] fix more missing includes
Include fixes for 2.6.14-git11. Should allow to remove sched.h from
module.h on i386, x86_64, arm, ia64, ppc, ppc64, and s390. Probably more
to come since I haven't yet checked the other archs.
Signed-off-by: Tim Schmielau <tim@physik3.uni-rostock.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
|
Revision tags: 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
|
|
Revision tags: v2.6.15-rc1 |
|
| #
e532c378 |
| 11-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
3b621ee5 |
| 11-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|