| commit | 2361f738b67ab7f1152187fa3d321a09b7c95c09 | [log] [tgz] |
|---|---|---|
| author | David Woodhouse <David.Woodhouse@intel.com> | Wed Aug 22 12:54:55 2012 +0100 |
| committer | David Woodhouse <David.Woodhouse@intel.com> | Wed Aug 22 12:55:43 2012 +0100 |
| tree | eddf2b958215b668b9b871b6b59bc76c67a47751 | |
| parent | 4800399e335658aae632f587f6759a860f584804 [diff] | |
| parent | d9875690d9b89a866022ff49e3fcea892345ad92 [diff] |
Merge tag 'v3.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux Having missed the merge window, update to 3.6-rc2 to avoid conflicts with new patches. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>