Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-irqflags
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Oct 2010 21:37:27 +0000 (14:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Oct 2010 21:37:27 +0000 (14:37 -0700)
commite36f561a2c88394ef2708f1ab300fe8a79e9f651
tree385f378c4240955e4356d49686a8ef606a82a7c1
parent70ada77920723fbc2b35e9b301022fb1e166b41b
parentdf9ee29270c11dba7d0fe0b83ce47a4d8e8d2101
Merge git://git./linux/kernel/git/dhowells/linux-2.6-irqflags

* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-irqflags:
  Fix IRQ flag handling naming
  MIPS: Add missing #inclusions of <linux/irq.h>
  smc91x: Add missing #inclusion of <linux/irq.h>
  Drop a couple of unnecessary asm/system.h inclusions
  SH: Add missing consts to sys_execve() declaration
  Blackfin: Rename IRQ flags handling functions
  Blackfin: Add missing dep to asm/irqflags.h
  Blackfin: Rename DES PC2() symbol to avoid collision
  Blackfin: Split the BF532 BFIN_*_FIO_FLAG() functions to their own header
  Blackfin: Split PLL code from mach-specific cdef headers
arch/ia64/include/asm/system.h
arch/s390/include/asm/system.h
arch/x86/include/asm/paravirt.h
include/linux/hardirq.h