| commit | a07aa004c8d814a975b1a68afdb7baaa8f1b91d5 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Jan 20 00:06:15 2011 -0800 |
| committer | David S. Miller <davem@davemloft.net> | Thu Jan 20 00:06:15 2011 -0800 |
| tree | 652edc2dce9732a64780b9e332034b6567631a8b | |
| parent | cc7ec456f82da7f89a5b376e613b3ac4311b3e9a [diff] | |
| parent | 5d8449286456659cdd0998e62d80df2d9e77e9e3 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6