The following commit has been merged in the linux branch: commit 1e103d198eb1effb43173412514ac3385ea6765f Merge: 80fa680d22c11912a0be84b8139422eba1327322 f8ebdff08740709a75e796f12cc5902e3b5b9dd6 Author: Linus Torvalds torvalds@linux-foundation.org Date: Tue Oct 13 10:05:04 2009 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: mfd: Fix twl4030 boot with twl4030 usb transceiver enabled