Stefan Roese 1318673045 Fix merge problems ... Signed-off-by: Stefan Roese <sr@denx.de>		2008-08-06 14:06:03 +02:00
..
bios_emulator	Big white-space cleanup.	2008-05-21 00:14:08 +02:00
block	Code cleanup: fix old style assignment ambiguities like "=-" etc.	2008-07-14 15:19:07 +02:00
dma	Big white-space cleanup.	2008-05-21 00:14:08 +02:00
hwmon	hwmon: rename CONFIG_DS1722 to CONFIG_DTT_DS1722	2008-07-13 15:35:02 +02:00
i2c	Fix merge problems	2008-08-06 14:05:38 +02:00
input	Code cleanup: fix old style assignment ambiguities like "=-" etc.	2008-07-14 15:19:07 +02:00
misc	FSL LAW: Add new interface to use the last free LAW	2008-06-11 01:53:09 -05:00
mmc	Fix merge problems	2008-08-06 14:05:38 +02:00
mtd	Fix merge problems	2008-08-06 14:05:38 +02:00
net	Fix merge problems	2008-08-06 14:05:38 +02:00
pci	pci: sh: Add pci_skip_dev and pci_print_dev function	2008-07-15 12:24:37 +09:00
pcmcia	pcmcia/ti_pci1410a: Move compile condition to the Makefile	2008-06-26 17:04:25 +02:00
qe	Big white-space cleanup.	2008-05-21 00:14:08 +02:00
rtc	silence misc printf formatting compiler warnings	2008-07-10 22:12:09 +02:00
serial	Fix merge problems	2008-08-06 14:06:03 +02:00
spi	Move conditional compilation of MPC8XXX SPI driver to Makefile	2008-07-01 21:02:11 +02:00
usb	Fix merge problems	2008-08-06 14:05:38 +02:00
video	Fix merge problems	2008-08-06 14:05:38 +02:00