mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/forcedeth.c
This commit is contained in:
commit
b2f8f7525c
30 changed files with 214 additions and 125 deletions
1
firmware/cis/.gitignore
vendored
Normal file
1
firmware/cis/.gitignore
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
*.cis
|
||||
Loading…
Reference in a new issue