From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 29 Oct 2007 19:10:49 +0000 (-0700)
Subject: Merge branch 'warnings-upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarz... 
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=a43f007ba19cef4fac953d9e860e8a668e042e2d;p=linux-edison.git

Merge branch 'warnings-upstream' of /linux/kernel/git/jgarzik/misc-2.6

* 'warnings-upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  [ISDN] capidrv: address two longstanding warnings
---

a43f007ba19cef4fac953d9e860e8a668e042e2d