Arnd Bergmann fc77b0e957 The 2nd mxs fixes for 3.9: ...

- Fix an error caused by incorrect conflict resolution when
    applying the patch
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJRPeg/AAoJEFBXWFqHsHzOmkEH/3mjPeA/bmly/LuUWd2BdS8W
 VbKzKKBJpXa34wFnj1aH2ydViPs4PWHHIxB2Z3u+epu+43w+DdDtjrM1XdX8lAYN
 5z90l5ZYXoeq2H3xaqCwCzHzp0FwxbrxmXN9Kr97pOxefAJMmpO8/yrMgtO2ADAd
 f3Z8wQCM7J4QRjCAHd+8sPsDfnkkGtMdlLsD3I2IRbBOU15LdaFVd1zXGbi/M/wo
 rW/3aZ9YbJSuOdwQ8ucGnNp+ZXiUUCPy9DDplt7yfpQkKhML/fqz3t6bznaZs/YD
 UWtqiP/wfVTlz9yhRCLOPoGU/ix8Rmk1ltZtTvqNY+b9JLsnFiwwK8Ngo4C5IcE=
 =TYXe
 -----END PGP SIGNATURE-----

Merge tag 'mxs-fixes-3.9-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes

From Shawn Guo <shawn.guo@linaro.org>:

The 2nd mxs fixes for 3.9:
 - Fix an error caused by incorrect conflict resolution when
   applying the patch

* tag 'mxs-fixes-3.9-2' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: mxs: cfa10049: Fix fb initialisation function

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

2013-03-11 21:52:57 +01:00

..

alpha

arch Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUS

2013-02-27 19:10:23 -08:00

arc

ARC: split elf.h into uapi and export it for userspace

2013-02-27 20:00:26 +05:30

arm

The 2nd mxs fixes for 3.9:

2013-03-11 21:52:57 +01:00

arm64

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2013-03-02 08:34:06 -08:00

avr32

arch Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUS

2013-02-27 19:10:23 -08:00

blackfin

Merge branch 'timer/cleanup' into late/mvebu2

2013-02-28 18:54:15 +01:00

c6x

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2013-02-26 20:16:07 -08:00

cris

Merge branch 'timer/cleanup' into late/mvebu2

2013-02-28 18:54:15 +01:00

frv

arch Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUS

2013-02-27 19:10:23 -08:00

h8300

arch Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUS

2013-02-27 19:10:23 -08:00

hexagon

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2013-02-26 20:16:07 -08:00

ia64

hlist: drop the node parameter from iterators

2013-02-27 19:10:24 -08:00

m32r

Merge branch 'timer/cleanup' into late/mvebu2

2013-02-28 18:54:15 +01:00

m68k

Merge branch 'timer/cleanup' into late/mvebu2

2013-02-28 18:54:15 +01:00

metag

ImgTec Meta architecture changes for v3.9-rc1

2013-03-03 12:06:09 -08:00

microblaze

arch Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUS

2013-02-27 19:10:23 -08:00

mips

Merge git://www.linux-watchdog.org/linux-watchdog

2013-03-03 10:23:29 -08:00

mn10300

arch Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUS

2013-02-27 19:10:23 -08:00

openrisc

arch Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUS

2013-02-27 19:10:23 -08:00

parisc

Merge branch 'fixes-for-3.9-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

2013-03-03 12:57:38 -08:00

powerpc

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2013-03-02 08:34:06 -08:00

s390

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2013-03-03 13:23:03 -08:00

score

arch Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUS

2013-02-27 19:10:23 -08:00

sh

hlist: drop the node parameter from iterators

2013-02-27 19:10:24 -08:00

sparc

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2013-03-02 08:34:06 -08:00

tile

arch Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUS

2013-02-27 19:10:23 -08:00

um

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2013-02-23 18:50:11 -08:00

unicore32

arch Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUS

2013-02-27 19:10:23 -08:00

x86

Bug-fixes:

2013-03-03 14:22:53 -08:00

xtensa

arch Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUS

2013-02-27 19:10:23 -08:00

.gitignore

…

Kconfig

ImgTec Meta architecture changes for v3.9-rc1

2013-03-03 12:06:09 -08:00