Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Mar 2010 00:41:09 +0000 (16:41 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Mar 2010 00:41:09 +0000 (16:41 -0800)
commitdaf9fe2ee9a203c4fc555cfe5c5f3d9f660e743c
tree18e5384b5cb170e5962f449afc89605ef5e65ea1
parent9d85929fefd040ca84a5e04ee704d043efcc3c2e
parent8d002bdc9f1f9a1220c0d87a7321f0233ace97cd
Merge branch 'for-linus' of git://git./linux/kernel/git/sameo/mfd-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
  mfd: Several MFD drivers should depend on GENERIC_HARDIRQS
  mfd: Fix sm501 requested region size
drivers/mfd/sm501.c