]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'oprofile/urgent' into oprofile/master
authorRobert Richter <robert.richter@amd.com>
Wed, 7 Dec 2011 17:45:19 +0000 (18:45 +0100)
committerRobert Richter <robert.richter@amd.com>
Wed, 7 Dec 2011 17:45:19 +0000 (18:45 +0100)
commit8685bbc0fc97bd2212fab72c9eb88c216bc8e71a
tree3dfc6d016fefa0d1cb68f38cac56a5e5f56e2b67
parentdd3c4670d7fafeb18bf7542fbcfd2606fb06a4a1
parentb835c0f47f725d864bf2545f10c733b754bb6d51
Merge branch 'oprofile/urgent' into oprofile/master
Documentation/kernel-parameters.txt
arch/s390/oprofile/hwsampler.c
arch/x86/oprofile/nmi_int.c
kernel/events/core.c