| commit | b5121290cad7c9e1a786952da4f6d9bfbfb87597 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 11 19:00:15 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 11 19:00:15 2011 -0700 |
| tree | a6e2c24f8bdb86e98cb4e962183d38a304436004 | |
| parent | 409ab140e2ec662e473d4968e12b7ac97f5a5f4e [diff] | |
| parent | c62dd365e248222903e6e3e3a8f5d8587e7e3345 [diff] |
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 for the TWL4030 PM sleep/wakeup sequence mfd: Fix asic3 build error mfd: Fixed gpio polarity of omap-usb gpio USB-phy reset