summaryrefslogtreecommitdiff
path: root/scripts/patch-kernel
diff options
context:
space:
mode:
authorAnton Vorontsov <cbouatmailru@gmail.com>2008-10-18 20:28:24 +0400
committerAnton Vorontsov <cbouatmailru@gmail.com>2008-10-18 20:28:24 +0400
commited8c3174dd227031d1f3b9fa4fbb512f8f623434 (patch)
treebac4953f8899d6600f4716c0bcde1e25e34c2591 /scripts/patch-kernel
parent8aef7e8f8de2d900da892085edbf14ea35fe6881 (diff)
parent0cfd81031a26717fe14380d18275f8e217571615 (diff)
downloadlinux-3.10-ed8c3174dd227031d1f3b9fa4fbb512f8f623434.tar.gz
linux-3.10-ed8c3174dd227031d1f3b9fa4fbb512f8f623434.tar.bz2
linux-3.10-ed8c3174dd227031d1f3b9fa4fbb512f8f623434.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: drivers/power/Makefile
Diffstat (limited to 'scripts/patch-kernel')
0 files changed, 0 insertions, 0 deletions