| #
7eb19553 |
| 01-Jan-2009 |
Mike Travis <travis@sgi.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask into merge-rr-cpumask
Conflicts:
arch/x86/kernel/io_apic.c
kernel/rcuclassic.c
kernel/sched.c
kerne
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask into merge-rr-cpumask
Conflicts:
arch/x86/kernel/io_apic.c
kernel/rcuclassic.c
kernel/sched.c
kernel/time/tick-sched.c
Signed-off-by: Mike Travis <travis@sgi.com>
[ mingo@elte.hu: backmerged typo fix for io_apic.c ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
show more ...
|
| #
923a789b |
| 02-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/cleanups
Conflicts:
arch/x86/kernel/reboot.c
|
| #
b21a2071 |
| 02-Jan-2009 |
David Vrabel <david.vrabel@csr.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Conflicts:
drivers/uwb/wlp/eda.c
|
| #
418f19ea |
| 31-Dec-2008 |
Pierre Ossman <drzeus@drzeus.cx> |
Merge branch 'master' of ../mmc
|
| #
2ca1a615 |
| 31-Dec-2008 |
Rusty Russell <rusty@rustcorp.com.au> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/x86/kernel/io_apic.c
|
| #
a9de18eb |
| 31-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into stackprotector
Conflicts:
arch/x86/include/asm/pda.h
kernel/fork.c
|
| #
818fa7f3 |
| 31-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'tracing/kmemtrace' into tracing/kmemtrace2
|
| #
5fdf7e59 |
| 31-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into tracing/kmemtrace
Conflicts:
mm/slub.c
|
| #
14a3c4ab |
| 31-Dec-2008 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (407 commits)
[ARM] pxafb: add support for overlay1 and overlay2 as frameb
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (407 commits)
[ARM] pxafb: add support for overlay1 and overlay2 as framebuffer devices
[ARM] pxafb: cleanup of the timing checking code
[ARM] pxafb: cleanup of the color format manipulation code
[ARM] pxafb: add palette format support for LCCR4_PAL_FOR_3
[ARM] pxafb: add support for FBIOPAN_DISPLAY by dma braching
[ARM] pxafb: allow pxafb_set_par() to start from arbitrary yoffset
[ARM] pxafb: allow video memory size to be configurable
[ARM] pxa: add document on the MFP design and how to use it
[ARM] sa1100_wdt: don't assume CLOCK_TICK_RATE to be a constant
[ARM] rtc-sa1100: don't assume CLOCK_TICK_RATE to be a constant
[ARM] pxa/tavorevb: update board support (smartpanel LCD + keypad)
[ARM] pxa: Update eseries defconfig
[ARM] 5352/1: add w90p910-plat config file
[ARM] s3c: S3C options should depend on PLAT_S3C
[ARM] mv78xx0: implement GPIO and GPIO interrupt support
[ARM] Kirkwood: implement GPIO and GPIO interrupt support
[ARM] Orion: share GPIO IRQ handling code
[ARM] Orion: share GPIO handling code
[ARM] s3c: define __io using the typesafe version
[ARM] S3C64XX: Ensure CPU_V6 is selected
...
show more ...
|
|
Revision tags: v2.6.28, v2.6.28-rc9 |
|
| #
fdb0a1a6 |
| 18-Dec-2008 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge branch 'next-merged' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
|
| #
56c035c9 |
| 18-Dec-2008 |
Ben Dooks <ben-linux@fluff.org> |
Merge branch 'next-s3c64xx-device' into next-merged
Conflicts:
arch/arm/mach-s3c2440/mach-at2440evb.c
|
| #
7f275437 |
| 18-Dec-2008 |
Ben Dooks <ben-linux@fluff.org> |
Merge branch 'next-s3c64xx' into next-merged
|
|
Revision tags: v2.6.28-rc8, v2.6.28-rc7, v2.6.28-rc6, v2.6.28-rc5, v2.6.28-rc4 |
|
| #
c33e14c7 |
| 03-Nov-2008 |
Ben Dooks <ben-linux@fluff.org> |
[ARM] s3c6400_defconfig: Add SDHCI driver
Add the Samsung SDHCI driver to the build.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
|
| #
6c874d6f |
| 03-Nov-2008 |
Ben Dooks <ben-linux@fluff.org> |
[ARM] s3c6400_defconfig: Add I2C driver and devices
Add the new I2C driver and the EEPROM devices to
the system, as well as update to the latest kernel.
Signed-off-by: Ben Dooks <ben-linux@fluff.or
[ARM] s3c6400_defconfig: Add I2C driver and devices
Add the new I2C driver and the EEPROM devices to
the system, as well as update to the latest kernel.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
show more ...
|
|
Revision tags: v2.6.28-rc3, v2.6.28-rc2, v2.6.28-rc1 |
|
| #
92117a1f |
| 21-Oct-2008 |
Ben Dooks <ben-linux@fluff.org> |
[ARM] S3C64XX: Add s3c6400_defconfig
Add a basic defconfig for s3c6400 series machines.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
|