summaryrefslogtreecommitdiffstats
path: root/drivers/video/au1200fb.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-01-03 13:48:25 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-03 13:48:25 -0800
commit9a2f1aad2f5bf005560c334d6f0aebd82726315b (patch)
tree20f71f9311db6d8578ab842f7d29b63322ae1f42 /drivers/video/au1200fb.h
parent23e8e5901d8c644c1d30d69d207d7f3c90e99e8c (diff)
parent93353e8088057dd988362e6cae727af43734b494 (diff)
Merge tag 'for-v3.13-fixes' of git://git.infradead.org/battery-2.6
Pull battery fixes from Anton Vorontsov: "Two fixes: - fix build error caused by max17042_battery conversion to the regmap API. - fix kernel oops when booting with wakeup_source_activate enabled" * tag 'for-v3.13-fixes' of git://git.infradead.org/battery-2.6: max17042_battery: Fix build errors caused by missing REGMAP_I2C config power_supply: Fix Oops from NULL pointer dereference from wakeup_source_activate
Diffstat (limited to 'drivers/video/au1200fb.h')
0 files changed, 0 insertions, 0 deletions