SHARE
TWEET

Untitled

a guest Sep 16th, 2013 158 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. # Unmerged paths:
  2. #   (use "git add <file>..." to mark resolution)
  3. #
  4. #       both modified:      arch/arm/Kconfig
  5. #       both modified:      arch/arm/include/asm/mutex.h
  6. #       both modified:      arch/arm/kernel/traps.c
  7. #       both modified:      arch/arm/mm/dma-mapping.c
  8. #       both modified:      arch/arm/mm/tlb-v7.S
  9. #       both modified:      arch/arm/vfp/vfpmodule.c
  10. #       both modified:      drivers/base/power/main.c
  11. #       both modified:      drivers/bluetooth/ath3k.c
  12. #       both modified:      drivers/bluetooth/btusb.c
  13. #       both modified:      drivers/gpu/drm/radeon/radeon_mode.h
  14. #       both modified:      drivers/mmc/card/block.c
  15. #       both modified:      drivers/mmc/host/sdhci.c
  16. #       both modified:      drivers/net/tun.c
  17. #       both modified:      drivers/usb/core/hub.c
  18. #       both modified:      drivers/usb/core/message.c
  19. #       both modified:      drivers/usb/host/xhci.h
  20. #       both modified:      fs/ubifs/dir.c
  21. #       both modified:      include/linux/freezer.h
  22. #       both modified:      include/linux/sched.h
  23. #       both modified:      include/net/bluetooth/hci_core.h
  24. #       both modified:      include/net/bluetooth/mgmt.h
  25. #       both modified:      kernel/cgroup.c
  26. #       both modified:      kernel/futex.c
  27. #       both modified:      kernel/power/suspend.c
  28. #       both modified:      kernel/signal.c
  29. #       both modified:      mm/madvise.c
  30. #       both modified:      net/bluetooth/hci_conn.c
  31. #       both modified:      net/bluetooth/hci_core.c
  32. #       both modified:      net/bluetooth/hci_event.c
  33. #       both modified:      net/bluetooth/l2cap_core.c
  34. #       both modified:      net/bluetooth/mgmt.c
  35. #       both modified:      net/bluetooth/rfcomm/sock.c
  36. #       both modified:      net/bluetooth/smp.c
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand
 
Top