aboutsummaryrefslogtreecommitdiff
path: root/CREDITS
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-07-03 16:13:28 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-07-03 16:13:28 +0100
commit946e2ad040000a14b7316fae722e7e65fa09ffe5 (patch)
tree6bc244a1c49221335e14bf795403debf6f24712d /CREDITS
parent543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff)
parente055d5bff318845f99c0fbf93245767fab8dce88 (diff)
Merge branch 'fb' into devel
Conflicts: arch/arm/Kconfig
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions