| #
1b7f6a62 |
| 21-Nov-2006 |
Andi Kleen <andi@basil.nowhere.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
237ee312 |
| 16-Nov-2006 |
Linus Torvalds <torvalds@woody.osdl.org> |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] Remove OP_MAX_COUNTER
[ARM] Remove PM_LEGACY=y from select
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] Remove OP_MAX_COUNTER
[ARM] Remove PM_LEGACY=y from selected ARM defconfigs
[ARM] 3857/2: pnx4008: add devices' registration
show more ...
|
| #
67517189 |
| 11-Nov-2006 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
[ARM] Remove PM_LEGACY=y from selected ARM defconfigs
Most ARM defconfigs don't actually need to have PM_LEGACY enabled.
Disable it for ATEB9200, Collie, IXP4xx, OMAP H2, S3C2410 and
Versatile.
Sig
[ARM] Remove PM_LEGACY=y from selected ARM defconfigs
Most ARM defconfigs don't actually need to have PM_LEGACY enabled.
Disable it for ATEB9200, Collie, IXP4xx, OMAP H2, S3C2410 and
Versatile.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
show more ...
|
|
Revision tags: 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, v2.6.17 |
|
| #
f0cd91a6 |
| 10-Jun-2006 |
James Bottomley <jejb@mulgrave.il.steeleye.com> |
Merge ../linux-2.6
|
|
Revision tags: v2.6.17-rc6, v2.6.17-rc5 |
|
| #
66643de4 |
| 24-May-2006 |
David Woodhouse <dwmw2@infradead.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-powerpc/unistd.h
include/asm-sparc/unistd.h
include/asm-sparc64/unistd.h
Signed-
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-powerpc/unistd.h
include/asm-sparc/unistd.h
include/asm-sparc64/unistd.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
show more ...
|
| #
badc48e6 |
| 20-May-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'master' into upstream
|
| #
3c06da5a |
| 19-May-2006 |
Paul Mackerras <paulus@samba.org> |
Merge ../linux-2.6
|
| #
20a92fc7 |
| 18-May-2006 |
KaiGai Kohei <kaigai@ak.jp.nec.com> |
Merge git://git.infradead.org/mtd-2.6
|
| #
5dd8816a |
| 17-May-2006 |
John W. Linville <linville@tuxdriver.com> |
Merge branch 'from-linus' into upstream
|
| #
18594822 |
| 16-May-2006 |
David Woodhouse <dwmw2@infradead.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
|
| #
5006ecc2 |
| 15-May-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'master' into upstream
|
| #
7d63b54a |
| 12-May-2006 |
Steven Whitehouse <swhiteho@redhat.com> |
Merge branch 'master'
|
|
Revision tags: v2.6.17-rc4 |
|
| #
d649dafd |
| 12-May-2006 |
Linus Torvalds <torvalds@g5.osdl.org> |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3508/1: Update collie defconfig
[ARM] Fix thread struct allocator for SMP case
[ARM] Update m
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3508/1: Update collie defconfig
[ARM] Fix thread struct allocator for SMP case
[ARM] Update mach-types
[ARM] Update versatile_defconfig
show more ...
|
| #
41b11afb |
| 09-May-2006 |
Pavel Machek <pavel@ucw.cz> |
[ARM] 3508/1: Update collie defconfig
Patch from Pavel Machek
Update collie defconfig to something that can bring closer-to-working
system to its user.
Signed-off-by: Pavel Machek <pavel@suse.cz>
[ARM] 3508/1: Update collie defconfig
Patch from Pavel Machek
Update collie defconfig to something that can bring closer-to-working
system to its user.
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
show more ...
|
|
Revision tags: 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 ...
|
|
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 |
|
| #
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'
|
| #
8f75015f |
| 07-Feb-2006 |
Paul Mackerras <paulus@samba.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
|
| #
3c9b3a85 |
| 07-Feb-2006 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
6cb6524d |
| 07-Feb-2006 |
Paul Mackerras <paulus@samba.org> |
Merge ../linux-2.6
|
| #
01d206a7 |
| 03-Feb-2006 |
Adrian Bunk <bunk@stusta.de> |
Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
|
Revision tags: v2.6.16-rc2 |
|
| #
18ee3610 |
| 02-Feb-2006 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|