aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/patch-kernel
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-03-02 23:29:32 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-03-02 23:29:32 +0000
commitb93a4afcff7be859e30cad2a305731516057d6cf (patch)
treefb5fe55864e16527e453efd18790a34db22ee2a1 /scripts/patch-kernel
parent[ARM] pxa: fix typo in mxm8x10.h (diff)
parentMerge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into ... (diff)
downloadlinux-b93a4afcff7be859e30cad2a305731516057d6cf.tar.gz
linux-b93a4afcff7be859e30cad2a305731516057d6cf.zip
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Conflicts: arch/arm/Makefile
Diffstat (limited to 'scripts/patch-kernel')
0 files changed, 0 insertions, 0 deletions