diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-04-08 16:02:24 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-04-08 16:02:24 +1000 |
| commit | 1b77ad268b4965df621b56dd180317f2770275b8 (patch) | |
| tree | ee7b0d19e8e259f0b36595e355a08dc2ea173a55 /arch/x86/include/asm/xen/hypercall.h | |
| parent | 5e4981fad6dcb580e175c450def4ae3504d524a0 (diff) | |
| parent | 59c23eabdae97a18cfc400339138f6d1dbde926a (diff) | |
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/ath6kl/os/linux/ar6000_android.c
drivers/staging/brcm80211/README
drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
drivers/staging/gma500/psb_drm.h
drivers/staging/gma500/psb_ttm_fence_user.h
drivers/staging/hv/hv_util.c
drivers/staging/hv/vmbus_drv.c
Diffstat (limited to 'arch/x86/include/asm/xen/hypercall.h')
0 files changed, 0 insertions, 0 deletions