summaryrefslogtreecommitdiffstats
path: root/net/netfilter/xt_DSCP.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-11-15 17:16:20 +0100
committerArnd Bergmann <arnd@arndb.de>2012-11-15 17:16:20 +0100
commita0c726cc2c174c935ca2c16c7201c4c82b1a8589 (patch)
tree2d8ce62941170f08421bb64f96aca6e4f36029f8 /net/netfilter/xt_DSCP.c
parenta46052c1941fd5ac1d8a73f1be32283493f21562 (diff)
parent0449410b0b8aeafa9b7e8bb719e4eeda8a5623fd (diff)
downloadlinux-a0c726cc2c174c935ca2c16c7201c4c82b1a8589.tar.bz2
Merge tag 'omap-for-v3.8/board-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards
From Tony Lindgren <tony@atomide.com>: Board updates for omaps mostly to deal with enabling display support with device tree until the bindings are ready. * tag 'omap-for-v3.8/board-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP1: use BUG_ON where possible OMAP: board-generic: enable DSS for panda & sdp boards OMAP: omap4sdp: move display init from board file to dss-common.c OMAP: panda: move display init from board file to dss-common.c ARM: OMAP2+: Nokia N9/N900/N950 -- mention product names Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'net/netfilter/xt_DSCP.c')
0 files changed, 0 insertions, 0 deletions