diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-04 16:58:41 +1100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-04 16:58:41 +1100 |
commit | 6edacf05c8362f4c368991b55d85e8122cfc9a24 (patch) | |
tree | 707dda607c42ec5f618b1fe6166775e9af8dd1f8 /fs/pstore/ftrace.c | |
parent | f19637e74309df700e9f731cffdc2427ab2d2c23 (diff) | |
parent | eda8eebdd153c48a4e2a3a3ac3cd9e2e31f5c6b3 (diff) | |
download | talos-obmc-linux-6edacf05c8362f4c368991b55d85e8122cfc9a24.tar.gz talos-obmc-linux-6edacf05c8362f4c368991b55d85e8122cfc9a24.zip |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc update from Benjamin Herrenschmidt:
"Just so that you don't get too bored on your Island here's a patch for
3.8 fixing a nasty bug that affects the new 64T support that was
merged in 3.7. Please apply whenever you have a chance (and an
internet connection!)"
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/mm: Fix hash computation function
Diffstat (limited to 'fs/pstore/ftrace.c')
0 files changed, 0 insertions, 0 deletions