diff options
| author | David S. Miller <davem@davemloft.net> | 2013-09-30 15:36:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-09-30 15:36:45 -0400 |
| commit | cb178190ab7d9c9b9fb90e36488ebd26ca004d32 (patch) | |
| tree | b2c7b9d6dda5600df21bb109eb7616b89039629d /net/sched/cls_basic.c | |
| parent | 7b77d161ce7e480a660692cab079712fc0268ba2 (diff) | |
| parent | f629d208d27a22f495b7734eede585b5d207e912 (diff) | |
| download | linux-cb178190ab7d9c9b9fb90e36488ebd26ca004d32.tar.gz linux-cb178190ab7d9c9b9fb90e36488ebd26ca004d32.tar.bz2 linux-cb178190ab7d9c9b9fb90e36488ebd26ca004d32.zip | |
Merge branch '20130926_include_linux_networking_externs' of git://repo.or.cz/linux-2.6/trivial-mods
Conflicts:
include/linux/netdevice.h
More extern removals from Joe Perches.
Minor conflict with the dev_notify_flags changes which added a new
argument to __dev_notify_flags().
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/cls_basic.c')
0 files changed, 0 insertions, 0 deletions