tree 874c1683f32f07614aa123f6ca5cf6c2bd443704
parent cf8e98d15361f8c594da00a3f7a500787fc1a426
parent 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe
author Chris Metcalf <cmetcalf@tilera.com> 1312316042 -0400
committer Chris Metcalf <cmetcalf@tilera.com> 1312316042 -0400

Merge tag 'v3.0' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus