diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-16 05:03:50 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-16 05:03:50 +0100 |
| commit | eb14f019597cd86c21a6c601d7e900f40030c2e7 (patch) | |
| tree | 36fb2f36a1747f98988f87215db1eef3a71d45eb /arch/xtensa/mm | |
| parent | 8390/8390p: Fix compat netdev ops handling. (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| download | linux-eb14f019597cd86c21a6c601d7e900f40030c2e7.tar.xz linux-eb14f019597cd86c21a6c601d7e900f40030c2e7.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e1000e/ich8lan.c
Diffstat (limited to 'arch/xtensa/mm')
0 files changed, 0 insertions, 0 deletions