Stefan Roese 8809a2713b rtc: Fix merging problem ...

Signed-off-by: Stefan Roese <sr@denx.de>

2007-12-11 11:46:01 +01:00

..

bios_emulator

…

block

…

hwmon

Merge commit 'u-boot/master' into for-1.3.1

2007-12-11 11:34:54 +01:00

i2c

…

input

…

misc

…

mtd

…

net

…

pci

…

pcmcia

…

qe

…

rtc

rtc: Fix merging problem

2007-12-11 11:46:01 +01:00

serial

…

usb

…

video

…