TI-Integration: ARM: DRA7: hwmod_data: Fix merge mangling of pcie and pruss data

The commit 8fb3a87 (Merge branch 'rpmsg-ti-linux-3.14.y' of
git://git.ti.com/rpmsg/rpmsg into ti-linux-3.14.y) has added
the pruss class and pruss1 hwmod data in between the pcie
hwmod data during merge conflict resolution. Reorder this
properly to maintain the order maintained in the hwmod data
files.

Signed-off-by: Suman Anna <s-anna@ti.com>
Merge branch 'ti-linux-3.14.y' of gitorious.ti.com:ti-linux-kernel/ti-linux-kernel into ti-lsk-linux-3.14.y

* 'ti-linux-3.14.y' of gitorious.ti.com:ti-linux-kernel/ti-linux-kernel:
  TI-Integration: ARM: DRA7: hwmod_data: Fix merge mangling of pcie and pruss data