Merge branch 'warnings-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 25 Oct 2007 22:58:18 +0000 (15:58 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 25 Oct 2007 22:58:18 +0000 (15:58 -0700)
* 'warnings-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  ISDN/sc: fix longstanding warning


Trivial merge