summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-05-27 23:59:57 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-05-27 23:59:57 +0200
commit239df0fd5ee25588f8a5ba7f7ee646940cc403f4 (patch)
treebfece31a51ceec2793cb69b3ac1c936e0652bcbc /Makefile
parentARM: kill pmd_off() (diff)
parentMerge branch 'for-rmk' of git://github.com/at91linux/linux-2.6-at91 into deve... (diff)
parentARM: 6945/1: Add unwinding support for division functions (diff)
downloadlinux-239df0fd5ee25588f8a5ba7f7ee646940cc403f4.tar.xz
linux-239df0fd5ee25588f8a5ba7f7ee646940cc403f4.zip
Merge branches 'devel', 'devel-stable' and 'fixes' into for-linus