diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-18 14:11:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-18 14:11:26 -0800 |
| commit | fe64454d7b0474cc43360d86267844b043275e82 (patch) | |
| tree | 5fb6004a52ebea38e24228ffe07809ab544bdadf /fs/nfsd | |
| parent | 8888be69adea1d86d694096cb206ef570e2d691a (diff) | |
| parent | 1e02b2c32484bfe0c5564d9be060b7d9821307b9 (diff) | |
| download | linux-fe64454d7b0474cc43360d86267844b043275e82.tar.bz2 | |
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: Unlock mc13783 before subsystems initialisation, at probe time.
mfd: WM835x GPIO direction register is not locked
mfd: tmio_mmc hardware abstraction for CNF area
mfd: WM8350 off by one bug
mfd: Correct WM835x ISINK ramp time defines
Diffstat (limited to 'fs/nfsd')
0 files changed, 0 insertions, 0 deletions