summaryrefslogtreecommitdiff
path: root/fs/dlm/plock.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-21 16:25:30 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-21 16:25:30 -0800
commit9a9a71b77c3fd511e5dda6236deb8a02d156b864 (patch)
tree304eb27f688f4420ce82b5689a1f1e74aab4ae0f /fs/dlm/plock.c
parentb9e44fe5ecda4158c22bc1ea4bffa378a4f83f65 (diff)
parent340a3504fd39dad753ba908fb6f894ee81fc3ae2 (diff)
Merge tag 'for-usb-linus-2012-02-21' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-linus
Hi Greg, Here's three bug fixes that should be queued for 3.3. The first fixes an issue we saw with an Intel Panther Point xHCI host, where a certain OSV's custom BIOS would disable the PCI device during boot. It changes the generic PCI quirks handler for all USB host controllers, but in a way both Jesse Barnes and Oliver Neukum have agreed is safe. The second patch is Elric Fu's first kernel patch! Congrats! It fixes a bug in the USB 3.0 hub reset handling. The last patch fixes a bug in the xHCI driver that feeds invalid input to the xHC host. Only the VIA host controller seems to have issues with it. Thanks to Felipe Contreras for testing this patch on his VIA host, and Andiry Xu for suggesting the fix. All three patches are marked for stable. Sarah Sharp
Diffstat (limited to 'fs/dlm/plock.c')
0 files changed, 0 insertions, 0 deletions