diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 12:49:01 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 12:49:01 -0700 |
commit | 174457391a83d70215d441cb3bc0aa7d7443b63e (patch) | |
tree | 14fc07f2aa07d993694fdfc757ebd0f82eb76397 /drivers/net/acenic.c | |
parent | 26cf445721763d61b08ce394f8bdbd4c5610b563 (diff) | |
parent | 6084c81e8a8ffa8b85d59e1ca7643dc76c23e412 (diff) | |
download | blackbird-op-linux-174457391a83d70215d441cb3bc0aa7d7443b63e.tar.gz blackbird-op-linux-174457391a83d70215d441cb3bc0aa7d7443b63e.zip |
Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
ARM: arch-shmobile: only run FSI init on respective boards
ARM: arch-shmobile: only run HDMI init on respective boards
ARM: mach-shmobile: Correctly check for CONFIG_MACH_MACKEREL
Diffstat (limited to 'drivers/net/acenic.c')
0 files changed, 0 insertions, 0 deletions