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)
commita43f007ba19cef4fac953d9e860e8a668e042e2d
tree50438fa41b83d1134f465e320c94dcf28ef158fd
parentf2b8544f5f50073fcc705e16b45a6821d50eb080
parentb393243fe7b711eb18eafaaf469bdb39317adf5b
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