summaryrefslogtreecommitdiff
path: root/include/linux/platform_data
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2013-04-15 12:59:20 +0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2013-04-15 13:00:38 +0400
commitcf2585a482e0ac83ab11928699c292d73c128fd6 (patch)
tree17ec169377b9cf68e247eb6f7940dfa4358c5500 /include/linux/platform_data
parentb61f232ff09b6cff22d5186001027438c620da39 (diff)
parentbbfce37b3ea11d13a984063a162c898a5fb23b1e (diff)
parent6cd2c7db41eab204b6474534df4ca68a7dc53d86 (diff)
parent8e524c95040aa521283aba126c047381eadaed39 (diff)
downloadlinux-cf2585a482e0ac83ab11928699c292d73c128fd6.tar.xz
fbdev: Merge fbdev topic branches
Merge branches '3.10/auo-k190x', '3.10/misc', '3.10/videomode' and '3.10/vt8500' into for-next