diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-02 15:41:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-02 15:41:49 -0800 |
| commit | 56f3f55cf9b604b924353ab6fcdac5fee5637ae3 (patch) | |
| tree | b031bd5d9833a27cec1c551e487810cc2bcb33c8 /include/linux/lockd | |
| parent | 049e2d13b8e8a6d8be43e675a5ed9d4613819f65 (diff) | |
| parent | 7716977b6ae5a0cdd0afab5c6035c4d0ce53f599 (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: Correct WM831X_MAX_ISEL_VALUE
Diffstat (limited to 'include/linux/lockd')
0 files changed, 0 insertions, 0 deletions