summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-12-04 20:33:54 +0300
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-04 20:33:54 +0300
commit602fd7c36728a04e61a442c9755e7d454501266c (patch)
tree6be77464bd07934a40959d68e5d08d75829bdc49 /include
parentd7931d9f7ab9de9158c6905caae979999134ad4d (diff)
parent88d27041cf4d36e499e2c54b6c44d9115ccf124a (diff)
downloadlinux-602fd7c36728a04e61a442c9755e7d454501266c.tar.xz
Merge branch 'for-rmk' of git://git.fluff.org/bjdooks/linux into devel-stable
Conflicts: arch/arm/Kconfig
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions