tree ee9718270736eee528300c071eac59caaf706af2
parent 18f22fbb8ba5570a5ea3d531bc4ec65cf211f11b
parent 1577e4b70a04cce39f296cc714da5ad5d272105a
author Linus Torvalds <torvalds@linux-foundation.org> 1222094766 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1222094766 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: jornada720_ts - fix build error ( LONG() usage )
  Input: bcm5974 - switch back to normal mode when closing