aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/parisc
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-12-04 17:33:54 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-04 17:33:54 +0000
commit602fd7c36728a04e61a442c9755e7d454501266c (patch)
tree6be77464bd07934a40959d68e5d08d75829bdc49 /drivers/parisc
parentMerge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable (diff)
parentARM: S3C6410: Correct names of IISv4 data output pin definitions (diff)
downloadlinux-dev-602fd7c36728a04e61a442c9755e7d454501266c.tar.xz
linux-dev-602fd7c36728a04e61a442c9755e7d454501266c.zip
Merge branch 'for-rmk' of git://git.fluff.org/bjdooks/linux into devel-stable
Conflicts: arch/arm/Kconfig
Diffstat (limited to 'drivers/parisc')
0 files changed, 0 insertions, 0 deletions