diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-06 13:34:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-06 13:34:45 -0800 |
| commit | 9858a38ea3a940762ae3028cce88f686d0e0c28b (patch) | |
| tree | f34a3ba1eba9be58cdd906e33280ce5b35d31b06 /block/blk-timeout.c | |
| parent | abb359450f20c32ae03039d8736f12b1d561caf5 (diff) | |
| parent | f862f904d357dc0d3612347a8dbabe6fae037fbb (diff) | |
Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: include Migo-R TS driver in Migo-R defconfig
sh: correct definitions to access stack pointers
sh: Tidy up SH-4A unaligned load support.
dma: shdma: NMI support.
sh: mach-sdk7786: Handle baseboard NMI source selection.
sh: mach-rsk: Add polled GPIO buttons support for RSK+7203.
sh: Break out cpuinfo_op procfs bits.
sh: Enable optional gpiolib for all CPUs with pinmux tables.
sh: migrate SH_CLK_MD to mode pin API.
sh: machvec IO death.
Diffstat (limited to 'block/blk-timeout.c')
0 files changed, 0 insertions, 0 deletions