diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-02 02:46:55 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-02 02:46:55 +0100 |
| commit | abc3f126ac736280c68db6472eb0040ddf6e1b1f (patch) | |
| tree | 4e3333cde6da6c49dcd81920410bf5a33055f03a /net/ipv6 | |
| parent | Merge branch 'picoxcell/soc' into next/soc (diff) | |
| parent | MAINTAINERS: add ARM/FREESCALE IMX6 entry (diff) | |
| download | linux-abc3f126ac736280c68db6472eb0040ddf6e1b1f.tar.xz linux-abc3f126ac736280c68db6472eb0040ddf6e1b1f.zip | |
Merge branch 'imx/imx6q' into next/soc
Conflicts:
Documentation/devicetree/bindings/arm/fsl.txt
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/plat-mxc/include/mach/common.h
Diffstat (limited to 'net/ipv6')
0 files changed, 0 insertions, 0 deletions