diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-07-18 18:56:34 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-18 18:56:34 +0200 |
commit | 913bdf1217f40c5e68c6b09f299177e5cd9629bd (patch) | |
tree | ae5562afcc41ef6aae85ce5fb043675f0a21c34e /arch/mips/cavium-octeon/Kconfig | |
parent | ARM:vt8500: Convert to use .restart and remove arch_reset() (diff) | |
parent | arm: ep93xx: Enable i2c support for ep9302 (diff) | |
download | linux-913bdf1217f40c5e68c6b09f299177e5cd9629bd.tar.xz linux-913bdf1217f40c5e68c6b09f299177e5cd9629bd.zip |
Merge tag 'ep93xx-fixes-for-3.6' of git://github.com/RyanMallon/linux-ep93xx into next/fixes-non-critical
From Ryan Mallon <ryanm@ok-labs.com>:
* tag 'ep93xx-fixes-for-3.6' of git://github.com/RyanMallon/linux-ep93xx:
arm: ep93xx: Enable i2c support for ep9302
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/mips/cavium-octeon/Kconfig')
0 files changed, 0 insertions, 0 deletions