Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Jan 2011 04:15:02 +0000 (20:15 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Jan 2011 04:15:02 +0000 (20:15 -0800)
commit2c79c69adc6205fd115e4b1980c979e1e0e1828a
tree25dbbb2f428ac4167cd0ae5d1274472b4daa6f06
parentdb9effe99adc67c53e6aedadadd2aa9a02342e48
parent5b026c4e3af52fda22c9313a3388344f82f3ba15
Merge branch 'sfi-release' of git://git./linux/kernel/git/lenb/linux-sfi-2.6

* 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6:
  SFI: use ioremap_cache() instead of ioremap()