diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-02 19:52:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-02 19:52:25 -0700 |
| commit | 9d4056aa9efa07015aa6da11ae2e72f22dc55c97 (patch) | |
| tree | 6294f50f9bde8ce24258410d8c20ac4d0650184f /net/lapb/lapb_timer.c | |
| parent | ca24a145573124732152daff105ba68cc9a2b545 (diff) | |
| parent | 2f584a146a2965b82fce89b8d2f95dc5cfe468d0 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull a couple more powerpc fixes from Benjamin Herrenschmidt:
"Here are two more fixes that I "missed" when scrubbing patchwork last
week which are worth still having in 3.5."
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/kvm: sldi should be sld
powerpc/xmon: Use cpumask iterator to avoid warning
Diffstat (limited to 'net/lapb/lapb_timer.c')
0 files changed, 0 insertions, 0 deletions