diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-13 01:01:37 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-13 01:01:37 -0500 |
| commit | 7dae8c5209147ad06d424928a5f1ec45caa87691 (patch) | |
| tree | 9d62ca389dde613cf6eba66710eb06d513f202a5 /arch/x86/include/asm/floppy.h | |
| parent | ac819a86a76dc29d18306f5c998c38af1ebb58cd (diff) | |
| parent | b2994d318dc78c9a4a43605629f00217335ada28 (diff) | |
Merge branch 'v3.4-next/devel-samsung-rtc' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers
* 'v3.4-next/devel-samsung-rtc' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S3C2443/S3C2416: add s3c_rtc_setname and rename rtc devices
rtc-s3c: add variants for S3C2443 and S3C2416
rtc-s3c: make room for more variants in devicetree block
ARM: SAMSUNG: cleanup of rtc register definitions
Diffstat (limited to 'arch/x86/include/asm/floppy.h')
0 files changed, 0 insertions, 0 deletions