aboutsummaryrefslogtreecommitdiff
path: root/include/rxrpc
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2010-01-22 13:07:40 +0100
committerLars-Peter Clausen <lars@metafoo.de>2010-01-22 13:07:40 +0100
commit159b90922d47078834dda75f3efab63c1bbecab6 (patch)
tree57a9cfde3e5dbeb2e4ccd57e4a6ed035988511c0 /include/rxrpc
parent058cbf4220fd2f1cd970bf553c044cb178e3804e (diff)
parent045da0e232795ff0637ee1c38a9822c9b823f4e7 (diff)
Merge branch 'gta02-machine-devices-2.6.32' into om-gta02-2.6.32
Conflicts: arch/arm/mach-s3c2442/Kconfig arch/arm/mach-s3c2442/Makefile
Diffstat (limited to 'include/rxrpc')
0 files changed, 0 insertions, 0 deletions