summaryrefslogtreecommitdiffstats
path: root/drivers/usb/phy/Kconfig
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2012-08-27 17:04:24 +0200
committerJiri Kosina <jkosina@suse.cz>2012-08-27 17:05:17 +0200
commit66a61fc0b2c3475f26f65b5f29ed5945b8efbf9e (patch)
tree28ebaaee56786cd9199e0e5802d166474d30d1e3 /drivers/usb/phy/Kconfig
parentHID: hid-debug: Show rdesc for unclaimed devices (diff)
parentMerge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
downloadlinux-66a61fc0b2c3475f26f65b5f29ed5945b8efbf9e.tar.xz
linux-66a61fc0b2c3475f26f65b5f29ed5945b8efbf9e.zip
Merge branch 'master' into upstream
Sync with Linus' tree so that we don't have build falures due to Quanta 3001 ID reshuffling.
Diffstat (limited to 'drivers/usb/phy/Kconfig')
0 files changed, 0 insertions, 0 deletions