merge mainline into cbi
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Wed, 1 Feb 2012 13:30:40 +0000 (14:30 +0100)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Wed, 1 Feb 2012 13:30:40 +0000 (14:30 +0100)
commitd68538e928c11110a867db0da33bbead76b95513
tree5809cdd136f4fd1de71bd570889afe9cc7d9ad00
parent855f93b7c524ee215bd154d4883c6a3d517e5ccb
parenta2b81d5399ba81c72f66ad506595ced3971803bc
merge mainline into cbi
grub-core/disk/usbms.c
include/grub/usb.h