[stable revert request] ... of doubled commit

[Jiri Slaby]

Hi,

Tony Jones found that the following commit:
  perf: Fix parsing of __print_flags() in TP_printk()
is applied to 3.0 twice.

Once as:
commit 248f3235861683bb1ffc7316b56bf783b162666f
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date:   Fri Nov 4 16:32:25 2011 -0400

    perf: Fix parsing of __print_flags() in TP_printk()

    commit d06c27b22aa66e48e32f03f9387328a9af9b0625 upstream.

===== and =====
The second one is this:
commit 2431496fbdd142ccc83138d94f3f510a36ce9270
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date:   Fri Nov 4 16:32:25 2011 -0400

    perf: Fix parsing of __print_flags() in TP_printk()

    commit 49908a1b25d448d68fd26faca260e1850201575f upstream.

=====

The latter is not an upstream commit, it is from pm-fixes, hence the
difference in commit SHAs.

2431496fbdd142ccc83138d94f3f510a36ce9270 needs to be reverted as it is
applied to a wrong function.

thanks,
-- 
js
suse labs
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/