diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-08 09:24:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-08 09:24:01 -0700 |
| commit | 622f8061a68d3f7a576c20a47b7f3bae7c8cfbef (patch) | |
| tree | b9fa9f4d92d80eaae27f5a6f6cb2ff8b5d007024 /net/unix | |
| parent | 6c96895e999f5c44a95a5cad6a6e32e7bd6e28b6 (diff) | |
| parent | dd4da3a55f99efbfd46674ebefdcc2878a57ef2a (diff) | |
Merge branch 'sh/for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
serial: sh-sci: fix sci interrupt handler
video: hitfb: Move over to dev_pm_ops.
video: hitfb: Convert to framebuffer_alloc().
video: sh_mobile_lcdcfb: Convert to framebuffer_alloc().
sh: add r8a66597 usb0 host to the se7724 board
usb: allow sh7724 to enable on-chip r8a66597
sh-sci: update receive error handling for muxed irqs
sh: define PERF_COUNTER_INDEX_OFFSET.
Diffstat (limited to 'net/unix')
0 files changed, 0 insertions, 0 deletions