]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
projects / mirror_ubuntu-kernels.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4fdaa7b e9677b3)
Merge branch 'oprofile/perf' into oprofile/core
authorRobert Richter <robert.richter@amd.com>
Mon, 11 Oct 2010 17:38:39 +0000 (19:38 +0200)
committerRobert Richter <robert.richter@amd.com>
Mon, 11 Oct 2010 17:38:39 +0000 (19:38 +0200)
Conflicts:
arch/arm/oprofile/common.c

Signed-off-by: Robert Richter <robert.richter@amd.com>

Trivial merge
Ubuntu combined Linux kernel mirror