summaryrefslogtreecommitdiffstats
path: root/arch/parisc/include/asm/perf_event.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-11-22 04:28:24 +0100
committerDavid S. Miller <davem@davemloft.net>2014-11-22 04:28:24 +0100
commit1459143386c5d868c87903b8d433a52cffcf3e66 (patch)
treee7878a550aaf6a3af5e84f4258bbcc3bbdd20fef /arch/parisc/include/asm/perf_event.h
parentMerge tag 'master-2014-11-20' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
downloadlinux-1459143386c5d868c87903b8d433a52cffcf3e66.tar.xz
linux-1459143386c5d868c87903b8d433a52cffcf3e66.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: drivers/net/ieee802154/fakehard.c A bug fix went into 'net' for ieee802154/fakehard.c, which is removed in 'net-next'. Add build fix into the merge from Stephen Rothwell in openvswitch, the logging macros take a new initial 'log' argument, a new call was added in 'net' so when we merge that in here we have to explicitly add the new 'log' arg to it else the build fails. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/parisc/include/asm/perf_event.h')
0 files changed, 0 insertions, 0 deletions