Resolve patch conflicts after rebase to 2.6.22 mainline
authorAndy Bavier <acb@cs.princeton.edu>
Fri, 25 May 2012 21:03:16 +0000 (17:03 -0400)
committerAndy Bavier <acb@cs.princeton.edu>
Fri, 25 May 2012 21:03:16 +0000 (17:03 -0400)
commite6eeaf653e0691c554c5d308a45cc80fdbc0ef00
treec09c641f513893a219f1c0fec6c4fabe23a283c4
parent45586570d40f1923af1f0bc4a92dcddd57c411fc
Resolve patch conflicts after rebase to 2.6.22 mainline
kernel-2.6.spec
linux-2.6-590-chopstix-intern.patch