Messages in this thread |  | | | Date | Tue, 24 Apr 2012 07:45:14 -0700 | | From | Greg KH <> | | Subject | Re: linux-next: manual merge of the staging tree with the driver-core tree |
| |
On Tue, Apr 24, 2012 at 02:48:37PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got conflicts in > drivers/staging/android/Kconfig and drivers/staging/android/Makefile > between commit 449a2bf5e881 ("Remove "switch" class in > drivers/staging/android/switch") from the driver-core tree and commit > ef2353d26bdc ("android-alarm: Remove unused android alarm in-kernel > interfaces") from the staging tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary.
Thanks, that looks fine.
greg k-h
|  |