mirror of
https://github.com/torvalds/linux.git
synced 2024-12-28 22:02:28 +00:00
5f013c9bc7
Conflicts: drivers/net/ethernet/altera/altera_sgdma.c net/netlink/af_netlink.c net/sched/cls_api.c net/sched/sch_api.c The netlink conflict dealt with moving to netlink_capable() and netlink_ns_capable() in the 'net' tree vs. supporting 'tc' operations in non-init namespaces. These were simple transformations from netlink_capable to netlink_ns_capable. The Altera driver conflict was simply code removal overlapping some void pointer cast cleanups in net-next. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| def.h | ||
| dm.c | ||
| dm.h | ||
| fw.c | ||
| fw.h | ||
| hw.c | ||
| hw.h | ||
| led.c | ||
| led.h | ||
| Makefile | ||
| phy.c | ||
| phy.h | ||
| pwrseq.c | ||
| pwrseq.h | ||
| pwrseqcmd.c | ||
| pwrseqcmd.h | ||
| reg.h | ||
| rf.c | ||
| rf.h | ||
| sw.c | ||
| sw.h | ||
| table.c | ||
| table.h | ||
| trx.c | ||
| trx.h | ||