| commit | 025304a517dce66b270f89a5d6a82191dd3838c6 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Thu Jun 20 15:26:08 2013 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Thu Jun 20 15:26:08 2013 +0200 |
| tree | 4cb2046ab468cc708d7779ae0277d2380be47b94 | |
| parent | a0639948b6fb28ebf2063b58ae6e0f4de693f6c3 [diff] | |
| parent | fb1c60288a886a28dc7c055449fd1936140fe891 [diff] |
Merge tag 'sunxi-defconfig-for-3.11' of git://github.com/mripard/linux into next/soc From Maxime Ripard: Allwinner defconfig changes for 3.11 * tag 'sunxi-defconfig-for-3.11' of git://github.com/mripard/linux: ARM: multi_v7: Enable Allwinner EMAC in multi_v7_defconfig Signed-off-by: Arnd Bergmann <arnd@arndb.de>