diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-06 01:41:32 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-06 01:41:32 (GMT) |
| commit | cb4f9a296472ebd1cde88970194888e962150875 (patch) | |
| tree | 257cf69e93eb1773e0c9c3905a84b4d476267b41 /drivers/hid/hid-logitech-dj.c | |
| parent | 813e64382a8a4afcbfd7caeba40292a8ea6d5cc3 (diff) | |
| parent | 636802ef96eebe279b22ad9f9dacfe29291e45c7 (diff) | |
| download | linux-cb4f9a296472ebd1cde88970194888e962150875.tar.xz | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc fixes from Benjamin Herrenschmidt:
"Here are a few fixes for 3.6 that were piling up while I was away or
busy (I was mostly MIA a week or two before San Diego).
Some fixes from Anton fixing up issues with our relatively new DSCR
control feature, and a few other fixes that are either regressions or
bugs nasty enough to warrant not waiting."
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc: Don't use __put_user() in patch_instruction
powerpc: Make sure IPI handlers see data written by IPI senders
powerpc: Restore correct DSCR in context switch
powerpc: Fix DSCR inheritance in copy_thread()
powerpc: Keep thread.dscr and thread.dscr_inherit in sync
powerpc: Update DSCR on all CPUs when writing sysfs dscr_default
powerpc/powernv: Always go into nap mode when CPU is offline
powerpc: Give hypervisor decrementer interrupts their own handler
powerpc/vphn: Fix arch_update_cpu_topology() return value
Diffstat (limited to 'drivers/hid/hid-logitech-dj.c')
0 files changed, 0 insertions, 0 deletions