diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-18 21:11:27 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-18 21:11:27 +0100 |
| commit | 80ae3fa5d6712ef3625eff617f72e190645d6361 (patch) | |
| tree | fd9be0ecbb4baa6385aa1a75af7ced5f7d691be4 /arch/arm/mach-pxa/time.c | |
| parent | Staging: Merge branch 'tidspbridge-for-2.6.39' of git://dev.omapzoom.org/pub/... (diff) | |
| parent | Linux 2.6.38-rc5 (diff) | |
| download | linux-80ae3fa5d6712ef3625eff617f72e190645d6361.tar.xz linux-80ae3fa5d6712ef3625eff617f72e190645d6361.zip | |
Merge 2.6.38-rc5 into staging-next
This is to resolve a merge conflict with:
drivers/staging/zram/zram_drv.c
as pointed out by Stephen Rothwell
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Robert Jennings <rcj@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/arm/mach-pxa/time.c')
0 files changed, 0 insertions, 0 deletions