diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-18 15:04:12 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-18 15:04:12 +0200 |
| commit | 396d81cd0fe12ce5d1f6d159f093f9315d2837bc (patch) | |
| tree | 555d26a1852d79a58b36b5cc0cfb30bf2c7fc5da /drivers/net/wireless/adm8211.c | |
| parent | 86e43a7aff23ce828273cbef6b0d2b0abe095ac8 (diff) | |
| parent | 73d68d91aa1b9e9cb6c1635143799c0fec484c08 (diff) | |
Merge branch 'at91/dt' into next/dt
This should help the merge with the at91 adc driver that is currently
in the staging tree.
* at91/dt:
ARM: at91: Add ADC driver to at91sam9260/at91sam9g20 dtsi files
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/net/wireless/adm8211.c')
0 files changed, 0 insertions, 0 deletions