diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-13 16:57:09 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-13 16:57:09 -0700 |
| commit | 89a86a2da30a6a90dda719874092905cd762b7ef (patch) | |
| tree | 140a289a990e7810e9c365bce304af1e065ca649 /drivers/oprofile/event_buffer.h | |
| parent | 71f882fe71823c54ae095ce29ce050f814eefdbc (diff) | |
| parent | 364ed2f4653d7c86ebedcc116a9cb34fd272867c (diff) | |
Merge branch 'staging-linus' into staging-next
We need this for the pstore fixes that went into the staging-linus branch, so
that things apply properly for the pstore/android code merge.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/oprofile/event_buffer.h')
0 files changed, 0 insertions, 0 deletions