diff options
| author | Kyle McMartin <kyle@redhat.com> | 2010-12-09 13:29:24 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2010-12-09 13:29:24 -0500 |
| commit | a3f45c4a9c4acadb3b0e3531a0d4d3649f711ebf (patch) | |
| tree | f24c9da1c1927f290aa3d1b640d7fa272860520d /sources | |
| parent | ee99a68c51ebd08409e45b63796f3c971c27e3d6 (diff) | |
| parent | 98e6119f39d3b83af3b533bed6bcff0e096f2397 (diff) | |
| download | kernel-a3f45c4a9c4acadb3b0e3531a0d4d3649f711ebf.tar.gz kernel-a3f45c4a9c4acadb3b0e3531a0d4d3649f711ebf.tar.xz kernel-a3f45c4a9c4acadb3b0e3531a0d4d3649f711ebf.zip | |
Merge branch 'kernel-git' strategy 'theirs'
Conflicts:
xhci_hcd-suspend-resume.patch
Diffstat (limited to 'sources')
| -rw-r--r-- | sources | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,3 +1,3 @@ 61f3739a73afb6914cb007f37fb09b62 linux-2.6.36.tar.bz2 -dd38a6caf08df2822f93541ee95aed7d patch-2.6.36.1.bz2 -33b11b4b8fcd47601a0e1e51586c4b04 patch-2.6.36.2-rc1.bz2 +a84cf559615b5168ec1d5591841601ed patch-2.6.37-rc5.bz2 +dbc90858467e28b39539ad6d3415a956 patch-2.6.37-rc5-git2.bz2 |