Merge branch 'linus' into sched/core, to resolve conflicts
[pandora-kernel.git] / Documentation / devicetree / bindings / serio /
drwxr-xr-x   ..
-rw-r--r-- 143 altera_ps2.txt
-rw-r--r-- 273 olpc,ap-sp.txt
-rw-r--r-- 407 snps-arc_ps2.txt