diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-05-02 17:13:39 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-02 17:13:39 +0200 |
commit | 473a37e86350c2b502044db0d22bdf36fd5d3302 (patch) | |
tree | 1963fc8d152077fa22b529cee3d326c7c7b26ba2 /net/lapb/lapb_timer.c | |
parent | 66f75a5d028beaf67c931435fdc3e7823125730c (diff) | |
parent | d86a3480543941344625d1c71aa70510d01f7b11 (diff) |
Merge tag 'imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6 into next/defconfig
ARM i.MX defconfig updates for 3.5
* tag 'imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6:
ARM: imx_v6_v7_defconfig: Add SPI NOR support
ARM: imx_v4_v5_defconfig: Let CONFIG_MACH_IMX27_DT be built by default
Diffstat (limited to 'net/lapb/lapb_timer.c')
0 files changed, 0 insertions, 0 deletions