tree ba2fa4b21e471d3d85a1b36d8992bd458cec4d4d
parent 84c48e6f43ae1771fc67fd8fcd777ff4b3b4465b
parent bc3bf8fd330ce981ce632a1a4a283eee46838f32
author Linus Torvalds <torvalds@linux-foundation.org> 1244924520 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1244924520 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] cnic: fix error: implicit declaration of function ‘__symbol_get’
  [SCSI] cnic: fix undefined reference to `ip6_route_output'