summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/frontends/lnbp21.h
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-03-01 23:19:05 +0100
committerTony Lindgren <tony@atomide.com>2010-03-01 23:19:05 +0100
commitd702d12167a2c05a346f49aac7a311d597762495 (patch)
treebaae42c299cce34d6df24b5d01f8b1d0b481bd9a /drivers/media/dvb/frontends/lnbp21.h
parentomap2: Initialize Menelaus and MMC for N8X0 (diff)
parentMerge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm (diff)
downloadlinux-d702d12167a2c05a346f49aac7a311d597762495.tar.xz
linux-d702d12167a2c05a346f49aac7a311d597762495.zip
Merge with mainline to remove plat-omap/Kconfig conflict
Conflicts: arch/arm/plat-omap/Kconfig
Diffstat (limited to 'drivers/media/dvb/frontends/lnbp21.h')
0 files changed, 0 insertions, 0 deletions