diff options
| author | Linus Torvalds <[email protected]> | 2010-03-26 22:11:20 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2010-03-26 22:11:20 +0000 |
| commit | 6f063aea557f66eea8c35034a25df85cae5ced33 (patch) | |
| tree | 326fefee4ba268d27e7b686a4af4e7a35b008428 /drivers/net/wan/lapbether.c | |
| parent | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | pcmcia: use dev_pm_ops for class pcmcia_socket_class (diff) | |
| download | kernel-6f063aea557f66eea8c35034a25df85cae5ced33.tar.gz kernel-6f063aea557f66eea8c35034a25df85cae5ced33.zip | |
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 'drivers/net/wan/lapbether.c')
0 files changed, 0 insertions, 0 deletions