| #
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 |
|
| #
5047f09b |
| 06-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>
|
| #
aad61439 |
| 05-May-2006 |
John W. Linville <linville@tuxdriver.com> |
Merge branch 'from-linus' into upstream
|
| #
f18fc729 |
| 05-May-2006 |
Paul Mackerras <paulus@samba.org> |
Merge ../linux-2.6
|
| #
f9cc8475 |
| 04-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] 3490/1: i.MX: move uart resources to board files
[ARM] 3488/1: make icedcc_putc do the right th
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3490/1: i.MX: move uart resources to board files
[ARM] 3488/1: make icedcc_putc do the right thing
[ARM] 3487/1: IXP4xx: Support non-PCI systems
[ARM] 3486/1: Mark memory as clobbered by the ARM _syscallX() macros
show more ...
|
| #
76bbb002 |
| 30-Apr-2006 |
Deepak Saxena <dsaxena@plexity.net> |
[ARM] 3487/1: IXP4xx: Support non-PCI systems
Patch from Deepak Saxena
This patch allows for the addition of IXP4xx systems that do not make
use of the PCI interface by moving the CONFIG_PCI symbol
[ARM] 3487/1: IXP4xx: Support non-PCI systems
Patch from Deepak Saxena
This patch allows for the addition of IXP4xx systems that do not make
use of the PCI interface by moving the CONFIG_PCI symbol selection to
be platform-specific instead of for all of IXP4xx. If at least one machine
with PCI support is built, the PCI code will be compiled in, but when
building !PCI, this will drastically shrink the kernel size.
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
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 |
|
| #
11ed56fb |
| 24-Mar-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'upstream'
Conflicts:
drivers/scsi/sata_vsc.c
|
| #
b4d8d1a9 |
| 23-Mar-2006 |
Anton Altaparmakov <aia21@cantab.net> |
Merge branch 'master' of /usr/src/ntfs-2.6/
|
| #
74293759 |
| 23-Mar-2006 |
Anton Altaparmakov <aia21@hera.kernel.org> |
Merge branch 'master' of /home/aia21/ntfs-2.6/
|
| #
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 ...
|
| #
1a02e59a |
| 20-Mar-2006 |
Kumar Gala <galak@kernel.crashing.org> |
Merge branch 'master'
|
| #
9a212471 |
| 20-Mar-2006 |
Steven Whitehouse <swhiteho@redhat.com> |
Merge branch 'master'
|
| #
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
|
| #
fd4a0b92 |
| 20-Mar-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>
|
| #
61c5504a |
| 20-Mar-2006 |
Kumar Gala <galak@kernel.crashing.org> |
Merge branch 'master'
|
|
Revision tags: v2.6.16 |
|
| #
23dd6401 |
| 17-Mar-2006 |
Paul Mackerras <paulus@samba.org> |
Merge ../linux-2.6
|
| #
abc71c46 |
| 17-Mar-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'upstream-fixes'
|
| #
6e48f1b7 |
| 17-Mar-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'master'
|
| #
dd288e7d |
| 15-Mar-2006 |
John W. Linville <linville@tuxdriver.com> |
Merge branch 'upstream-fixes'
|
| #
c5111f50 |
| 15-Mar-2006 |
Dave Kleikamp <shaggy@austin.ibm.com> |
Merge with /home/shaggy/git/linus-clean/
|
| #
f33b5d78 |
| 14-Mar-2006 |
James Bottomley <jejb@mulgrave.il.steeleye.com> |
Merge ../linux-2.6
|
| #
58a343f2 |
| 14-Mar-2006 |
Dmitry Torokhov <dtor_core@ameritech.net> |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
7cafae52 |
| 12-Mar-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] iwmmxt thread state alignment
[ARM] 3350/1: Enable 1-wire on ARM
[ARM] 3356/1: Workaround for
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] iwmmxt thread state alignment
[ARM] 3350/1: Enable 1-wire on ARM
[ARM] 3356/1: Workaround for the ARM1136 I-cache invalidation problem
[ARM] 3355/1: NSLU2: remove propmt depends
[ARM] 3354/1: NAS100d: fix power led handling
[ARM] Fix muldi3.S
show more ...
|
|
Revision tags: v2.6.16-rc6 |
|
| #
e7fcdb79 |
| 09-Mar-2006 |
Alessandro Zummo <a.zummo@towertech.it> |
[ARM] 3355/1: NSLU2: remove propmt depends
Patch from Alessandro Zummo
The patch that would have made the NSLU2
kernel non compatible with other ixp4xx machs
never entered the kernel. So it is actu
[ARM] 3355/1: NSLU2: remove propmt depends
Patch from Alessandro Zummo
The patch that would have made the NSLU2
kernel non compatible with other ixp4xx machs
never entered the kernel. So it is actually
safe to remove the prompt dependencies.
Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
show more ...
|