author | Mauro Carvalho Chehab <mchehab@redhat.com> | |
Wed, 28 Nov 2012 09:22:38 +0000 (07:22 -0200) | ||
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | |
Wed, 28 Nov 2012 09:22:38 +0000 (07:22 -0200) |
* 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()
...
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()
...
diff --cc MAINTAINERS
index b6236790811111c163cab91a6b57f8dddad42845,9386a63ea8f63b653b683379ea54c7bd91eb72ec..9fba9ed4f61560e994ad30d89855be0b255a32df
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
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 <laurent.pinchart@ideasonboard.com>
+ 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 <jussi.kivilinna@mbnet.fi>
L: linux-wireless@vger.kernel.org
diff --cc drivers/media/i2c/adv7604.c
Simple merge
diff --cc drivers/media/i2c/soc_camera/mt9v022.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc drivers/media/usb/dvb-usb-v2/rtl28xxu.c
Simple merge