summaryrefslogtreecommitdiff
path: root/arch/um/drivers/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-04-09 17:50:59 +0400
committerArnd Bergmann <arnd@arndb.de>2013-04-09 18:01:23 +0400
commit835f9c38bbb4498c3d43b7466964bdadbb1fd244 (patch)
treeade5aec66bc7ddb97048c4f141932de0f93369b9 /arch/um/drivers/Makefile
parentf5f29151588744ea2e283971cb0ad403ee04e3e2 (diff)
parenta937536b868b8369b98967929045f1df54234323 (diff)
downloadlinux-835f9c38bbb4498c3d43b7466964bdadbb1fd244.tar.xz
Merge tag 'v3.9-rc3' into next/multiplatform
Linux 3.9-rc3 Conflicts: arch/arm/Kconfig arch/arm/mach-spear/spear3xx.c arch/arm/plat-spear/Kconfig This is a dependency for ux500/multiplatform Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/um/drivers/Makefile')
0 files changed, 0 insertions, 0 deletions