| commit | ca5f73a05ebfbf74ea9874d5eaad8d63d7e69b4f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Dec 22 19:47:04 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Dec 22 19:47:04 2010 -0800 |
| tree | ff48e1162f66528b579d2eb60cec6c871a165797 | |
| parent | 97dbf37d89b6d387a5fe79ffe3b72c37ec12db43 [diff] | |
| parent | b93cef556162b0f33399bfe5f307c54f51554e09 [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: Support additional parent IDs for wm831x mfd: Fix ab8500-core interrupt ffs bit bug mfd: Supply IRQ base for WM832x devices watchdog: Fix null pointer dereference while accessing rdc321x platform_data gpio: Fix null pointer dereference while accessing rdc321x platform_data