diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-19 18:50:03 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-19 18:50:03 -0500 |
| commit | 4457e6f6c9f6052cd5f44a79037108b5ddeb0ce7 (patch) | |
| tree | 394733989d9f68e8380ace4948976a92336e6b16 /drivers/net/ethernet/oki-semi | |
| parent | e87e7be92979480ee5a2d4a746dc88f2eeca79ca (diff) | |
| parent | 6a328f3fe042396c6525d7bf84cfd941440cc045 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller:
"Two merge window fallout build fixes"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: merge fix
sparc64: fix build regession
Diffstat (limited to 'drivers/net/ethernet/oki-semi')
0 files changed, 0 insertions, 0 deletions