summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx28.dtsi
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2013-02-21 19:16:55 +0400
committerRalf Baechle <ralf@linux-mips.org>2013-02-22 13:07:30 +0400
commitedb15d83a875a1f4b1576188844db5c330c3267d (patch)
tree74d54eab401b6ccf2a6ad4821227108a8d160f03 /arch/arm/boot/dts/imx28.dtsi
parent8bfc245f9ad7bd4e461179e4e7852ef99b8b6144 (diff)
parenta0b1c42951dd06ec83cc1bc2c9788131d9fefcd8 (diff)
downloadlinux-edb15d83a875a1f4b1576188844db5c330c3267d.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mips-for-linux-next
Conflicts: include/linux/ssb/ssb_driver_gige.h Also resolves a logical merge conflict in drivers/net/ethernet/broadcom/- bgmac.c due to change of an API.
Diffstat (limited to 'arch/arm/boot/dts/imx28.dtsi')
0 files changed, 0 insertions, 0 deletions