linux/net/netlabel
Linus Torvalds 06f4e926d2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1446 commits)
  macvlan: fix panic if lowerdev in a bond
  tg3: Add braces around 5906 workaround.
  tg3: Fix NETIF_F_LOOPBACK error
  macvlan: remove one synchronize_rcu() call
  networking: NET_CLS_ROUTE4 depends on INET
  irda: Fix error propagation in ircomm_lmp_connect_response()
  irda: Kill set but unused variable 'bytes' in irlan_check_command_param()
  irda: Kill set but unused variable 'clen' in ircomm_connect_indication()
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
  be2net: Kill set but unused variable 'req' in lancer_fw_download()
  irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication()
  atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_peer().
  rxrpc: Kill set but unused variable 'local' in rxrpc_UDP_error_handler()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_rotate_tx_window()
  pkt_sched: Kill set but unused variable 'protocol' in tc_classify()
  isdn: capi: Use pr_debug() instead of ifdefs.
  tg3: Update version to 3.119
  tg3: Apply rx_discards fix to 5719/5720
  ...

Fix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c
as per Davem.
2011-05-20 13:43:21 -07:00
..
Kconfig [NETLABEL]: Fix build failure. 2006-11-05 16:44:06 -08:00
Makefile netlabel: Add a generic way to create ordered linked lists of network addrs 2008-10-10 10:16:32 -04:00
netlabel_addrlist.c netlabel: Always remove the correct address selector 2009-04-22 00:46:09 -07:00
netlabel_addrlist.h net: Remove unnecessary returns from void function()s 2010-05-17 23:23:14 -07:00
netlabel_cipso_v4.c netlabel: Fix set-but-unused variables. 2011-04-17 17:01:49 -07:00
netlabel_cipso_v4.h net: kill unused macros 2010-12-19 21:59:35 -08:00
netlabel_domainhash.c Fix common misspellings 2011-03-31 11:26:23 -03:00
netlabel_domainhash.h netlabel: Update kernel configuration API 2008-12-31 12:54:11 -05:00
netlabel_kapi.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
netlabel_mgmt.c Fix common misspellings 2011-03-31 11:26:23 -03:00
netlabel_mgmt.h net: kill unused macros 2010-12-19 21:59:35 -08:00
netlabel_unlabeled.c net,rcu: convert call_rcu(netlbl_unlhsh_free_addr6) to kfree_rcu() 2011-05-07 22:51:06 -07:00
netlabel_unlabeled.h net: kill unused macros 2010-12-19 21:59:35 -08:00
netlabel_user.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
netlabel_user.h netlink: kill loginuid/sessionid/sid members from struct netlink_skb_parms 2011-03-03 10:55:40 -08:00