summaryrefslogtreecommitdiffstats
path: root/drivers/net/can/sja1000/peak_pci.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-12-20 12:10:29 +0100
committerIngo Molnar <mingo@elte.hu>2011-12-20 12:10:29 +0100
commit124ba9403318d834ef21bcd899c22c870708d2c4 (patch)
tree2ac84214085de8780dfa565be7e3ef0d675f6a68 /drivers/net/can/sja1000/peak_pci.c
parent74eec26facadbe6dbc0621bc862892c915c4534f (diff)
parentdd3c4670d7fafeb18bf7542fbcfd2606fb06a4a1 (diff)
downloadlinux-124ba9403318d834ef21bcd899c22c870708d2c4.tar.bz2
Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/core
Diffstat (limited to 'drivers/net/can/sja1000/peak_pci.c')
0 files changed, 0 insertions, 0 deletions