]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Merge branch 'irq-fix' of git://www.modarm9.com/gitsrc/pub/people/ukleinek/linux...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 7 May 2008 20:54:02 +0000 (21:54 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 7 May 2008 20:55:01 +0000 (21:55 +0100)
1  2 
arch/arm/mach-ns9xxx/irq.c

Simple merge