diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-15 00:33:21 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-15 00:33:21 +0300 |
| commit | 353495a5abcee1368a93f71b0e49390f96f24fb4 (patch) | |
| tree | d6063bd97f82371068befb082e8efc1dd778f18f /fs/nfs/file.c | |
| parent | f9ae3e125ceb8226c94d7d0c640927fa8b7f256a (diff) | |
| parent | 1b39ed0cf51193f3ba03044369ab4d144712a9b8 (diff) | |
| download | linux-353495a5abcee1368a93f71b0e49390f96f24fb4.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
regulator: tps6586x: correct register table
regulator: tps6586x: Handle both enable reg/bits being the same
regulator: tps6586x: Fix TPS6586X_DVM to store goreg/bit
regulator: tps6586x: Add missing bit mask generation
Diffstat (limited to 'fs/nfs/file.c')
0 files changed, 0 insertions, 0 deletions