aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pnp/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-03 15:46:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-03 15:46:37 -0700
commit39059cceeda478cd040d521b9541d1113035c908 (patch)
tree56adf04d6766a4346160aacd709468e5b2f1b879 /drivers/pnp/Makefile
parentb01b7dc2832a1a286ae84ffa3e940ce9f8e352c2 (diff)
parentc2cdf6aba0dfcfb54be646ab630c1bccd180e890 (diff)
downloadkernel_samsung_smdk4412-39059cceeda478cd040d521b9541d1113035c908.tar.gz
kernel_samsung_smdk4412-39059cceeda478cd040d521b9541d1113035c908.tar.bz2
kernel_samsung_smdk4412-39059cceeda478cd040d521b9541d1113035c908.zip
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/macio: Fix probing of macio devices by using the right of match table agp/uninorth: Fix oops caused by flushing too much powerpc/pasemi: Update MAINTAINERS file powerpc/cell: Fix integer constant warning powerpc/kprobes: Remove resume_execution() in kprobes powerpc/macio: Don't dereference pointer before null check
Diffstat (limited to 'drivers/pnp/Makefile')
0 files changed, 0 insertions, 0 deletions