summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebie...David S. Miller2012-08-2452-180/+368
|\
| * ipv6: move dereference after check in fl_free()Dan Carpenter2012-08-161-5/+2
| * userns: Convert tun/tap to use kuid and kgid where appropriateEric W. Biederman2012-08-142-15/+32
| * userns: Make the airo wireless driver use kuids for proc uids and gidsEric W. Biederman2012-08-142-22/+28
| * userns: xt_owner: Add basic user namespace support.Eric W. Biederman2012-08-142-7/+24
| * userns xt_recent: Specify the owner/group of ip_list_perms in the initial use...Eric W. Biederman2012-08-142-3/+11
| * userns: Convert xt_LOG to print socket kuids and kgids as uids and gidsEric W. Biederman2012-08-142-7/+10
| * userns: Convert cls_flow to work with user namespaces enabledEric W. Biederman2012-08-142-5/+12
| * net sched: Pass the skb into change so it can access NETLINK_CBEric W. Biederman2012-08-1410-10/+19
| * userns: nfnetlink_log: Report socket uids in the log sockets user namespaceEric W. Biederman2012-08-142-5/+10
| * userns: Teach inet_diag to work with user namespacesEric W. Biederman2012-08-144-8/+20
| * userns: Implement sk_user_nsEric W. Biederman2012-08-141-0/+9
| * netlink: Make the sending netlink socket availabe in NETLINK_CBEric W. Biederman2012-08-142-2/+5
| * userns: Convert net/ax25 to use kuid_t where appropriateEric W. Biederman2012-08-143-10/+16
| * pidns: Export free_pid_nsEric W. Biederman2012-08-141-0/+2
| * net ip6 flowlabel: Make owner a union of struct pid * and kuid_tEric W. Biederman2012-08-144-9/+48
| * userns: Use kgids for sysctl_ping_group_rangeEric W. Biederman2012-08-144-29/+35
| * userns: Print out socket uids in a user namespace aware fashion.Eric W. Biederman2012-08-1416-27/+36
| * userns: Make seq_file's user namespace accessibleEric W. Biederman2012-08-142-0/+18
| * userns: Allow USER_NS and NET simultaneously in KconfigEric W. Biederman2012-08-141-1/+1
| * userns: Convert sock_i_uid to return a kuid_tEric W. Biederman2012-08-142-4/+4
| * userns: Convert __dev_set_promiscuity to use kuids in audit logsEric W. Biederman2012-08-141-3/+4
| * userns: Convert net/core/scm.c to use kuids and kgidsEric W. Biederman2012-08-142-10/+25
| * userns: Fix link restrictions to use uid_eqEric W. Biederman2012-08-031-3/+3
| * userns: Allow the usernamespace support to build after the removal of usbfsEric W. Biederman2012-08-031-1/+0
* | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh...David S. Miller2012-08-246-507/+410
|\ \
| * | sfc: Fix the initial device operstateBen Hutchings2012-08-241-3/+3
| * | sfc: Assign efx and efx->type as early as possible in efx_pci_probe()Ben Hutchings2012-08-241-9/+6
| * | sfc: Remove bogus comment about MTU change and RX buffer overrunBen Hutchings2012-08-241-2/+0
| * | sfc: Remove overly paranoid locking assertions from netdev operationsBen Hutchings2012-08-242-10/+0
| * | sfc: Fix reset vs probe/remove/PM races involving efx_nic::stateBen Hutchings2012-08-241-41/+43
| * | sfc: Improve log messages in case we abort probe due to a pending resetBen Hutchings2012-08-241-4/+3
| * | sfc: Never try to stop and start a NIC that is disabledBen Hutchings2012-08-241-21/+44
| * | sfc: Hold RTNL lock (only) when calling efx_stop_interrupts()Ben Hutchings2012-08-241-3/+3
| * | sfc: Keep disabled NICs quiescent during suspend/resumeBen Hutchings2012-08-241-12/+16
| * | sfc: Hold the RTNL lock for more of the suspend/resume cycleBen Hutchings2012-08-241-0/+8
| * | sfc: Change state names to be clearer, and comment themBen Hutchings2012-08-244-21/+17
| * | sfc: Stash header offsets for TSO in struct tso_stateBen Hutchings2012-08-241-16/+12
| * | sfc: Replace tso_state::full_packet_space with ip_base_lenBen Hutchings2012-08-241-9/+11
| * | sfc: Simplify TSO header buffer allocationBen Hutchings2012-08-243-218/+112
| * | sfc: Stop TX queues before they fill upBen Hutchings2012-08-243-115/+112
| * | sfc: Refactor struct efx_tx_buffer to use a flags fieldBen Hutchings2012-08-243-56/+53
* | | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2012-08-24106-721/+1765
|\ \ \
| * \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-08-24106-721/+1765
| |\ \ \
| | * \ \ Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-08-233-1/+46
| | |\ \ \
| | | * | | mac80211: Fix AP mode regressionSujith Manoharan2012-08-221-1/+1
| | | * | | Revert "rfkill: remove dead code"AceLan Kao2012-08-212-0/+45
| | * | | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlw...John W. Linville2012-08-2215-93/+241
| | |\ \ \ \
| | | * | | | iwlwifi: fix FW restart on init FWAmit Beka2012-08-211-2/+7
| | | * | | | iwlwifi: fix the preparation of the cardEmmanuel Grumbach2012-08-211-9/+8