aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/telephony
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-07-27 09:22:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-27 09:22:55 -0700
commit02e7cce2bc3ac82b971d1efe489f23ca0b6e1d4a (patch)
tree8a2579a63dafc1e7a47c0d9281e315dd6d9568d7 /drivers/telephony
parenta376bca61096c7a79393e8125b7ad4757ccff19c (diff)
parenteb9650d6d989f24f21232a055d8fd45f1a9dcf99 (diff)
downloadkernel_samsung_smdk4412-02e7cce2bc3ac82b971d1efe489f23ca0b6e1d4a.zip
kernel_samsung_smdk4412-02e7cce2bc3ac82b971d1efe489f23ca0b6e1d4a.tar.gz
kernel_samsung_smdk4412-02e7cce2bc3ac82b971d1efe489f23ca0b6e1d4a.tar.bz2
Merge git://git.infradead.org/users/cbou/battery-2.6.35
* git://git.infradead.org/users/cbou/battery-2.6.35: ds2782_battery: Rename get_current to fix build failure / name conflict
Diffstat (limited to 'drivers/telephony')
0 files changed, 0 insertions, 0 deletions