git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4cbe75b 98d943b)
Merge branch 'oprofile/urgent' into oprofile/core
authorRobert Richter <robert.richter@amd.com>
Fri, 1 Oct 2010 06:54:17 +0000 (08:54 +0200)
committerRobert Richter <robert.richter@amd.com>
Fri, 1 Oct 2010 06:54:17 +0000 (08:54 +0200)
Conflicts:
arch/arm/oprofile/common.c

Signed-off-by: Robert Richter <robert.richter@amd.com>
1  2 
arch/arm/oprofile/common.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/oprofile/common.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.