Merge branch 'master' into for-next
[linux-2.6] / drivers / accessibility / Makefile
1 obj-y                           += braille/