From: Mauro Carvalho Chehab Date: Wed, 28 Nov 2012 09:22:38 +0000 (-0200) Subject: Merge remote-tracking branch 'linus/master' into staging/for_v3.8 X-Git-Tag: next-20121205~94^2~1^2~21 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d033a308d81ec83908760a15a841c2bd0d5e0ea3;p=karo-tx-linux.git Merge remote-tracking branch 'linus/master' into staging/for_v3.8 * linus/master: (1428 commits) futex: avoid wake_futex() for a PI futex_q watchdog: using u64 in get_sample_period() writeback: put unused inodes to LRU after writeback completion mm: vmscan: check for fatal signals iff the process was throttled Revert "mm: remove __GFP_NO_KSWAPD" proc: check vma->vm_file before dereferencing UAPI: strip the _UAPI prefix from header guards during header installation include/linux/bug.h: fix sparse warning related to BUILD_BUG_ON_INVALID Linux 3.7-rc7 powerpc/eeh: Do not invalidate PE properly ALSA: hda - Fix build without CONFIG_PM of/address: sparc: Declare of_iomap as an extern function for sparc again PM / QoS: fix wrong error-checking condition bnx2x: remove redundant warning log vxlan: fix command usage in its doc 8139cp: revert "set ring address before enabling receiver" MPI: Fix compilation on MIPS with GCC 4.4 and newer MIPS: Fix crash that occurs when function tracing is enabled MIPS: Merge overlapping bootmem ranges jbd: Fix lock ordering bug in journal_unmap_buffer() ... --- d033a308d81ec83908760a15a841c2bd0d5e0ea3 diff --cc MAINTAINERS index b62367908111,9386a63ea8f6..9fba9ed4f615 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -7919,8 -7825,14 +8014,15 @@@ T: git git://linuxtv.org/media_tree.gi W: http://www.ideasonboard.org/uvc/ S: Maintained F: drivers/media/usb/uvc/ +F: include/uapi/linux/uvcvideo.h + USB WEBCAM GADGET + M: Laurent Pinchart + L: linux-usb@vger.kernel.org + S: Maintained + F: drivers/usb/gadget/*uvc*.c + F: drivers/usb/gadget/webcam.c + USB WIRELESS RNDIS DRIVER (rndis_wlan) M: Jussi Kivilinna L: linux-wireless@vger.kernel.org