Merge branch 'linux-2.6'
[pandora-kernel.git] / drivers / char / snsc_event.c
Simple merge