Merge branch 'warnings-upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarz...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 29 Oct 2007 19:10:49 +0000 (12:10 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 29 Oct 2007 19:10:49 +0000 (12:10 -0700)
* 'warnings-upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  [ISDN] capidrv: address two longstanding warnings


Trivial merge