diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-09-05 09:57:19 +0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-09-05 09:57:19 +0400 |
| commit | e6c340171f0daaccc95b90abbeed2b837157ee11 (patch) | |
| tree | 843d4035be59bd791321910e52157ce527b3b4b3 /arch/s390/oprofile/hwsampler.c | |
| parent | a85442ade272121927a56e02f7dfde1127482df2 (diff) | |
| parent | 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d (diff) | |
| download | linux-e6c340171f0daaccc95b90abbeed2b837157ee11.tar.xz | |
Merge tag 'v3.6-rc4' into next
Linux 3.6-rc4
# gpg: Signature made Sat 01 Sep 2012 10:40:33 AM PDT using RSA key ID 00411886
# gpg: Good signature from "Linus Torvalds <torvalds@linux-foundation.org>"
Diffstat (limited to 'arch/s390/oprofile/hwsampler.c')
| -rw-r--r-- | arch/s390/oprofile/hwsampler.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/s390/oprofile/hwsampler.c b/arch/s390/oprofile/hwsampler.c index a4a89fa980d6..0cb385da202c 100644 --- a/arch/s390/oprofile/hwsampler.c +++ b/arch/s390/oprofile/hwsampler.c @@ -1,6 +1,4 @@ -/** - * arch/s390/oprofile/hwsampler.c - * +/* * Copyright IBM Corp. 2010 * Author: Heinz Graalfs <graalfs@de.ibm.com> */ |