Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Feb 2010 00:08:50 +0000 (16:08 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Feb 2010 00:08:50 +0000 (16:08 -0800)
* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: fix interrupt state restore
  microblaze: Defconfig update


Trivial merge