summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-24 22:28:35 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-24 22:28:35 +0200
commitf50d1d9e8d964fdd3b4cedfbca8843d1bc5916c1 (patch)
tree105b5bc4bb96b555dba90fa11dd5af66784c132f /init
parentMerge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
parentpcmcia: Make struct pcmcia_device_id const, sound drivers edition (diff)
downloadlinux-f50d1d9e8d964fdd3b4cedfbca8843d1bc5916c1.tar.xz
linux-f50d1d9e8d964fdd3b4cedfbca8843d1bc5916c1.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: Make struct pcmcia_device_id const, sound drivers edition staging: pcmcia: Convert pcmcia_device_id declarations to const pcmcia: Convert pcmcia_device_id declarations to const pcmcia: Make declaration and uses of struct pcmcia_device_id const pcmcia/sa1100: put sa11x0_pcmcia_hw_init[] to .devinit.data
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions