summaryrefslogtreecommitdiffstats
path: root/sound/spi
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-03-24 21:24:36 +0100
committerDavid S. Miller <davem@davemloft.net>2009-03-24 21:24:36 +0100
commitb5bb14386eabcb4229ade2bc0a2b237ca166d37d (patch)
tree1966e65479f0d12cec0a204443a95b8eb57946db /sound/spi
parentucc_geth: Fix build breakage caused by a merge (diff)
parentnetfilter: nf_conntrack: Reduce conntrack count in nf_conntrack_free() (diff)
downloadlinux-b5bb14386eabcb4229ade2bc0a2b237ca166d37d.tar.xz
linux-b5bb14386eabcb4229ade2bc0a2b237ca166d37d.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'sound/spi')
0 files changed, 0 insertions, 0 deletions