Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Conflicts:

	sound/pci/Kconfig
This commit is contained in:
David Woodhouse 2008-07-14 15:49:04 -07:00
commit 751851af7a
181 changed files with 29649 additions and 50283 deletions

View file

@ -220,7 +220,7 @@ out_noalloc:
return retval;
}
static int packetize_data(void *data, size_t length)
static int packetize_data(const u8 *data, size_t length)
{
int rc = 0;
int done = 0;