aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorDavid Vrabel <david.vrabel@csr.com>2008-10-20 16:07:19 +0100
committerDavid Vrabel <david.vrabel@csr.com>2008-10-20 16:07:19 +0100
commit61e0e79ee3c609eb34edf2fe023708cba6a79b1f (patch)
tree663deacffd4071120dc9badb70428fe5f124c7b9 /CREDITS
parentc15895ef30c2c03e99802951787183039a349d32 (diff)
parent0cfd81031a26717fe14380d18275f8e217571615 (diff)
downloadkernel_samsung_smdk4412-61e0e79ee3c609eb34edf2fe023708cba6a79b1f.zip
kernel_samsung_smdk4412-61e0e79ee3c609eb34edf2fe023708cba6a79b1f.tar.gz
kernel_samsung_smdk4412-61e0e79ee3c609eb34edf2fe023708cba6a79b1f.tar.bz2
Merge branch 'master' into for-upstream
Conflicts: Documentation/ABI/testing/sysfs-bus-usb drivers/Makefile
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions