Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88...
commitaf575e2d2e09517a8190f1b425453cc3e0102f6c
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Jan 2011 18:58:44 +0000 (17 10:58 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Jan 2011 18:58:44 +0000 (17 10:58 -0800)
tree4be2556d0bb6d756a62b2682df3d3c648e4a77a6
parent584ef2cd70acb0e473ba51e1073c2c5c95a2d27a
parentf5de6ecc84b58ba0f394365eafc8681af7a4f73d
Merge branch 'for-linus' of git://git./linux/kernel/git/mattst88/alpha-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
  alpha: fix WARN_ON in __local_bh_enable()
  alpha: fix breakage caused by df9ee29270
  alpha: add GENERIC_HARDIRQS_NO__DO_IRQ to Kconfig
  alpha/osf_sys: remove unused MAX_SELECT_SECONDS
  alpha: change to new Makefile flag variables
  alpha: kill off alpha_do_IRQ
  alpha: irq clean up
  alpha: use set_irq_chip and push down __do_IRQ to the machine types