David S. Miller b48b63a1f6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/netfilter/nfnetlink_log.c net/netfilter/xt_LOG.c Rather easy conflict resolution, the 'net' tree had bug fixes to make sure we checked if a socket is a time-wait one or not and elide the logging code if so. Whereas on the 'net-next' side we are calculating the UID and GID from the creds using different interfaces due to the user namespace changes from Eric Biederman. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-09-15 11:43:53 -04:00
..
android	Staging: Android alarm: IOCTL command encoding fix	2012-09-04 14:18:43 -07:00
asus_oled
bcm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-08-01 10:26:23 -07:00
ccg
comedi	staging: comedi: das08: Correct AO output for das08jr-16-ao	2012-09-04 11:55:38 -07:00
cptm1217	staging/cptm1217: fix checkpatch warnings	2012-07-19 16:11:26 -07:00
crystalhd
csr	staging: csr: add INET dependancy	2012-08-14 16:53:21 -07:00
cxt1e1
echo
et131x	staging/et131x: fix checkpatch warnings	2012-07-19 16:01:30 -07:00
frontier	staging/frontier: fix checkpatch warnings	2012-07-19 16:11:26 -07:00
ft1000	staging: ft1000-usb: Fix various checkpach warnings in ft1000_usb.h	2012-07-16 19:06:18 -07:00
gdm72xx	netlink: Rename pid to portid to avoid confusion	2012-09-10 15:30:41 -04:00
iio	staging iio: fix potential memory leak in lis3l02dq_ring.c	2012-08-27 19:09:25 +01:00
ipack	Staging: ipack: change naming convention in TODO file	2012-07-17 10:32:10 -07:00
keucr
line6
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-07-31 18:47:44 -07:00
net
nvec	Staging tree patches for 3.6-rc1	2012-07-26 11:14:49 -07:00
octeon	staging: octeon_ethernet: Convert to use device tree.	2012-07-23 13:54:53 +01:00
olpc_dcon	drivers: OLPC: update various drivers to include olpc-ec.h	2012-07-31 23:27:29 -04:00
omap-thermal	staging: omap-thermal: add OMAP5 data structures	2012-07-16 19:04:16 -07:00
omapdrm	drm/omap: add more new timings fields	2012-09-10 16:04:21 -07:00
ozwpan	staging: ozwpan: fix memcmp() test in oz_set_active_pd()	2012-09-04 12:48:00 -07:00
panel	staging: panel: Use pr_info(...) rather than printk(KERN_INFO	2012-07-16 18:57:26 -07:00
phison
quickstart
ramster
rtl8187se
rtl8192e
rtl8192u
rtl8712	staging: r8712u: fix bug in r8712_recv_indicatepkt()	2012-09-10 15:58:31 -07:00
rts5139	staging: rts5139: rts51x_card: fixed brace coding style issue	2012-07-17 10:30:59 -07:00
rts_pstor	staging/rts_pstor: use kthread_run instead doing kthread_create and wake_up_process	2012-07-16 19:24:46 -07:00
sbe-2t3e3	staging: sbe-2t3e3: Remove code that will never execute	2012-07-19 15:59:58 -07:00
sep	staging: sep_crypto.c: remove duplicated include	2012-07-19 17:20:06 -07:00
serqt_usb2
slicoss
sm7xxfb	staging: sm7xxfb: fix for "rename smtc_screen_info to smtc_scr_info"	2012-07-19 15:36:08 -07:00
speakup
ste_rmi4	staging: ste_rmi4: Fix typos	2012-07-16 19:24:46 -07:00
telephony
tidspbridge
usbip
vme	vme_user.c: remove duplicated include	2012-07-19 15:39:39 -07:00
vt6655
vt6656	staging: vt6656: [BUG] - Failed connection, incorrect endian.	2012-09-04 13:54:23 -07:00
winbond	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-08-24 12:25:30 -04:00
wlags49_h2	staging: wlags49_h2: remove vi modelines	2012-07-16 19:13:48 -07:00
wlags49_h25
wlan-ng	staging: wlan-ng: Fix problem with wrong arguments	2012-09-04 12:23:52 -07:00
xgifb
zcache	staging: zcache: fix cleancache race condition with shrinker	2012-09-05 12:06:48 -07:00
zram
zsmalloc
Kconfig	staging: OMAP4+: thermal: introduce bandgap temperature sensor	2012-07-16 19:02:47 -07:00
Makefile	staging: OMAP4+: thermal: introduce bandgap temperature sensor	2012-07-16 19:02:47 -07:00
staging.c