summaryrefslogtreecommitdiffstats
path: root/fs/devpts
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-26 15:11:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-26 15:11:20 -0700
commit6f063aea557f66eea8c35034a25df85cae5ced33 (patch)
tree326fefee4ba268d27e7b686a4af4e7a35b008428 /fs/devpts
parentf3845f3f6081b97ebc4dc905e097c07e868017b5 (diff)
parentd7646f7632549124fe70fec8af834c7c1246f365 (diff)
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: use dev_pm_ops for class pcmcia_socket_class power: support _noirq actions on device types and classes pcmcia: allow for four multifunction subdevices (again) pcmcia: do not use ioports < 0x100 on x86 pd6729: Coding Style fixes
Diffstat (limited to 'fs/devpts')
0 files changed, 0 insertions, 0 deletions