]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ia64/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 00:54:05 +0000 (10:54 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 00:54:05 +0000 (10:54 +1000)
1  2 
arch/ia64/include/asm/futex.h
arch/ia64/kernel/iosapic.c
arch/ia64/kernel/msi_ia64.c
arch/ia64/sn/kernel/irq.c

Simple merge
Simple merge
Simple merge
Simple merge