Wolfgang Denk 2a49bf3149 Merge branch 'master' into next ... Conflicts: board/esd/plu405/plu405.c drivers/rtc/ftrtc010.c Signed-off-by: Wolfgang Denk <wd@denx.de>		2009-12-05 02:11:59 +01:00
..
bios_emulator
block
dma
fpga
gpio
hwmon
i2c	Add a unified s3c24x0 header file	2009-11-27 16:26:13 -06:00
input
misc
mmc	omap3_mmc: Encapsulate twl4030 under option CONFIG_TWL4030_POWER	2009-11-27 16:26:18 -06:00
mtd	Merge branch 'master' into next	2009-12-05 02:11:59 +01:00
net
pci
pcmcia
power
qe
rtc	Merge branch 'master' into next	2009-12-05 02:11:59 +01:00
serial	Add a unified s3c24x0 header file	2009-11-27 16:26:13 -06:00
spi
twserial
usb	Add a unified s3c24x0 header file	2009-11-27 16:26:13 -06:00
video
watchdog