diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-30 10:51:11 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-30 10:51:11 -1000 |
| commit | 250f8e3db646028353a2a737ddb7a894c97a1098 (patch) | |
| tree | 1a92e2b11faf832923fe1a42ec25d19c2957ec75 /drivers/net/davinci_cpdma.c | |
| parent | 464c9098bbc17b4596aa12191a7e646a28e7587a (diff) | |
| parent | 5903417cd66d87a126f5cf27a846fc0985093f06 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
sungem: fix compile failure caused by trivial #include consolidation
Diffstat (limited to 'drivers/net/davinci_cpdma.c')
0 files changed, 0 insertions, 0 deletions