diff options
author | 2010-02-11 14:06:15 -0800 | |
---|---|---|
committer | 2010-02-11 14:06:15 -0800 | |
commit | 06a57f4f20d7bf7c3796abd541a7d400483a4596 (patch) | |
tree | 86f7c7436a21e6c558b8e12948afb76872d56cf4 /fs/proc/kmsg.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (diff) | |
parent | wm97xx_battery: Handle missing platform data gracefully (diff) | |
download | linux-dev-06a57f4f20d7bf7c3796abd541a7d400483a4596.tar.xz linux-dev-06a57f4f20d7bf7c3796abd541a7d400483a4596.zip |
Merge git://git.infradead.org/users/cbou/battery-2.6.33
* git://git.infradead.org/users/cbou/battery-2.6.33:
wm97xx_battery: Handle missing platform data gracefully
Diffstat (limited to 'fs/proc/kmsg.c')
0 files changed, 0 insertions, 0 deletions