aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/pnp.txt
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-07-31 09:20:02 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-07-31 09:20:02 -0400
commitceb0885d3b01bb2e2f18765770e212914f2864be (patch)
tree0952c90cd49704a9172e985ca491d79b60c40bc8 /Documentation/pnp.txt
parentb31fc7af78e17b0203e1cd5a195c590e8adeae0d (diff)
parent08458ef6eede6cf7d5a33c3a7c8bcdc3943012c2 (diff)
Merge branch 'misc' into devel
Conflicts: arch/arm/mm/init.c
Diffstat (limited to 'Documentation/pnp.txt')
0 files changed, 0 insertions, 0 deletions