aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m32r/lib/ashxdi3.S
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2006-09-17 18:17:19 +0200
committerStefan Richter <stefanr@s5r6.in-berlin.de>2006-09-17 18:19:31 +0200
commit9b4f2e9576658c4e52d95dc8d309f51b2e2db096 (patch)
tree7b1902b0f931783fccc6fee45c6f9c16b4fde5ce /arch/m32r/lib/ashxdi3.S
parent3c6c65f5ed5a6d307bd607aecd06d658c0934d88 (diff)
parent803db244b9f71102e366fd689000c1417b9a7508 (diff)
downloadkernel_samsung_smdk4412-9b4f2e9576658c4e52d95dc8d309f51b2e2db096.zip
kernel_samsung_smdk4412-9b4f2e9576658c4e52d95dc8d309f51b2e2db096.tar.gz
kernel_samsung_smdk4412-9b4f2e9576658c4e52d95dc8d309f51b2e2db096.tar.bz2
ieee1394: merge from Linus
Conflicts: drivers/ieee1394/hosts.c Patch "lockdep: annotate ieee1394 skb-queue-head locking" was meddling with patch "ieee1394: fix kerneldoc of hpsb_alloc_host". Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'arch/m32r/lib/ashxdi3.S')
0 files changed, 0 insertions, 0 deletions