diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 09:07:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 09:07:15 -0700 |
| commit | 0d43f5123d1456669b3bbc69854faf6fd5b14caa (patch) | |
| tree | e69d4418d579e55a004c2263ac49a46aac161a54 /drivers/net/yellowfin.c | |
| parent | fb3165b59f9ce510fed07262db20fdb799f88fa6 (diff) | |
| parent | ffb4a73d8906f71910e6c83ec2b499e70025ee8e (diff) | |
| download | blackbird-op-linux-0d43f5123d1456669b3bbc69854faf6fd5b14caa.tar.gz blackbird-op-linux-0d43f5123d1456669b3bbc69854faf6fd5b14caa.zip | |
Merge branch 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Fix hugetlbfs dependencies for SH-3 && MMU configurations.
sh: Document uImage.bin target in archhelp.
sh: add uImage.bin target
sh: rsk7203 CONFIG_MTD=n fix
sh: Check for return_to_handler when unwinding the stack
sh: Build fix: define more __movmem* symbols
sh: __irq_entry annotate do_IRQ().
Fix up sh/powerpc conflicts in fs/Kconfig
Diffstat (limited to 'drivers/net/yellowfin.c')
0 files changed, 0 insertions, 0 deletions
