summaryrefslogtreecommitdiff
path: root/promisc.c
diff options
context:
space:
mode:
Diffstat (limited to 'promisc.c')
0 files changed, 0 insertions, 0 deletions
f12b3604556a80c362a0d'>diff)
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott: "Contains include 86xx fixes, minor device tree fixes, an erratum workaround, and a kconfig dependency fix."
Diffstat