diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-12-01 11:56:03 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-12-01 11:56:03 +0100 |
commit | fd6da696f38b00ffeae1185d6f0ec5d4ab3b472d (patch) | |
tree | 27a52ff8c74ec62f604f72e68255df884ec5c112 /include/uapi/mtd | |
parent | 18423d3562f396206e0928a71177eeb2edfed077 (diff) | |
parent | 7321090f6751c9987c26a8c81c63680d16a614d7 (diff) | |
download | blackbird-obmc-linux-fd6da696f38b00ffeae1185d6f0ec5d4ab3b472d.tar.gz blackbird-obmc-linux-fd6da696f38b00ffeae1185d6f0ec5d4ab3b472d.zip |
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
- Don't build 'perf kvm stat" on non-x86 arches, fix from Xiao Guangrong.
- UAPI fixes to get perf building again in non-x86 arches, from David Howells.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/mtd')
0 files changed, 0 insertions, 0 deletions