diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-09-10 11:02:37 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-10 11:12:21 -0400 |
| commit | e415765f90105a7d2d1b410559520d925444136f (patch) | |
| tree | 3dd52133a3d6001bb75c3e3608705c7baa8c5ccc /net/switchdev/switchdev.c | |
| parent | 85ff58a3be610ca567a78c5d4e45ddd2e89088db (diff) | |
| parent | 4884f769e65b2b02bfdafb9f64217844dfa3d84f (diff) | |
Merge branch 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6 into next/defconfig
Pull "ARM: LPC32xx: Device tree updates" from Roland Stigge:
This enables ubifs in the lpc32xx defconfig.
* 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6:
ARM: LPC32xx: defconfig update
Diffstat (limited to 'net/switchdev/switchdev.c')
0 files changed, 0 insertions, 0 deletions