diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-19 08:38:23 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-19 08:38:23 +0100 |
| commit | 198d6ba4d7f48c94f990f4604f0b3d73925e0ded (patch) | |
| tree | 56bbdf8ba2553c23c8099da9344a8f1d1aba97ab /include/asm-frv | |
| parent | net: sctp should update its inuse counter (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
| download | linux-198d6ba4d7f48c94f990f4604f0b3d73925e0ded.tar.xz linux-198d6ba4d7f48c94f990f4604f0b3d73925e0ded.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/isdn/i4l/isdn_net.c
fs/cifs/connect.c
Diffstat (limited to 'include/asm-frv')
0 files changed, 0 insertions, 0 deletions