diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 18:15:34 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 18:15:34 +0200 |
| commit | 8a87f1a6c8f6b78758f4e5e8e616b0df821ba2b2 (patch) | |
| tree | f6861436c41fc7284e582025b0f847a4552c773b /drivers/nfc/microread | |
| parent | drivers/soc: ti: fix build break with modules (diff) | |
| parent | rtc: sunxi: Depend on platforms sun4i/sun7i that actually have the rtc (diff) | |
| download | linux-8a87f1a6c8f6b78758f4e5e8e616b0df821ba2b2.tar.xz linux-8a87f1a6c8f6b78758f4e5e8e616b0df821ba2b2.zip | |
Merge tag 'sunxi-drivers-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/drivers
Pull "Allwinner drivers additions for 3.18" from Maxime Ripard:
Nothing major, just handling the RTC driver changes needed for the A31/A23.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'sunxi-drivers-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
rtc: sunxi: Depend on platforms sun4i/sun7i that actually have the rtc
rtc: sun6i: Add sun6i RTC driver
Diffstat (limited to 'drivers/nfc/microread')
0 files changed, 0 insertions, 0 deletions