aboutsummaryrefslogtreecommitdiff
path: root/drivers/pcmcia/pxa2xx_lubbock.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-26 19:09:22 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-26 19:09:22 -0800
commit9ccc236269c1a838b58148c94ac0eeeca885b836 (patch)
treefbe9c922a21da9e949ecad1fd6eb39420aa58c2a /drivers/pcmcia/pxa2xx_lubbock.c
parentda457d4b93f9d746b0afd4aa65c94759f190d642 (diff)
parentc5d4a9997b4b2ec71cff0b219f05c6bc51f3fc79 (diff)
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] cio: Register/unregister subchannels only from kslowcrw. [S390] Add missing die_notifier() call to die(). [S390] Fix memory detection. [S390] Explicitly code allocpercpu calls in iucv [S390] Dont overwrite lowcores on smp_send_stop(). [S390] Optimize storage key handling for anonymous pages [S390] Fix kernel preemption. [S390] appldata: remove unused binary sysctls. [S390] cmm: remove unused binary sysctls. [S390] Fix irq tracing and lockdep_sys_exit calls. [S390] magic sysrq: check for in_atomic before doing an console_unblank [S390] cio: change device sense procedure to work with pav aliases
Diffstat (limited to 'drivers/pcmcia/pxa2xx_lubbock.c')
0 files changed, 0 insertions, 0 deletions