]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'modules/modules-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Oct 2012 01:24:34 +0000 (12:24 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Oct 2012 01:24:34 +0000 (12:24 +1100)
commite3da53d687635801e468bbb33b3f2bc06eedb64c
tree795ae4a6d2644becce80f149a7d90aaa4373c13b
parente48d190a97a2d04231d87d85df067b253a5a40ba
parent7460bf44fd45b11a82a989305d4fc4e47ec7fd4f
Merge remote-tracking branch 'modules/modules-next'

Conflicts:
kernel/module.c
kernel/module.c