| commit | b6f4098897f30b7ea90a1c1edf35e9b20a9d828a | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon Jan 24 13:00:48 2011 -0800 |
| committer | David S. Miller <davem@davemloft.net> | Mon Jan 24 13:00:48 2011 -0800 |
| tree | 349c3db295d6f3d6895ff1e181842914379e53d8 | |
| parent | 23624935e0c4b04730ed8d7d21f0cd25b2c2cda1 [diff] | |
| parent | 6493d24f77d8e4fe94913eb504ed9ffebb433402 [diff] |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6