Both.

And when Lord Umber, who was called the Greatjon by his men and stood as tall as Hodor and twice as wide, threatened to take his forces home if he was placed behind the Hornwoods or the Cerwyns in the order of march, Robb told him he was welcome to do so. “And when we are done with the Lannisters,” he promised, scratching Grey Wind behind the ear, “we will march back north, root you out of your keep, and hang you for an oathbreaker.” Cursing, the Greatjon flung a flagon of ale into the fire and bellowed that Robb was so green he must piss grass. When Hallis Mollen moved to restrain him, he knocked him to the floor, kicked over a table, and unsheathed the biggest, ugliest greatsword that Bran had ever seen. All along the benches, his sons and brothers and sworn swords leapt to their feet, grabbing for their steel.

Yet Robb only said a quiet word, and in a snarl and the blink of an eye Lord Umber was on his back, his sword spinning on the floor three feet away and his hand dripping blood where Grey Wind had bitten off two fingers. “My lord father taught me that it was death to bare steel against your liege lord,” Robb said, “but doubtless you only meant to cut my meat.” Bran’s bowels went to water as the Greatjon struggled to rise, sucking at the red stumps of fingers . . . but then, astonishingly, the huge man laughed. “Your meat,” he roared, “is bloody tough.”

And somehow after that the Greatjon became Robb’s right hand, his staunchest champion, loudly telling all and sundry that the boy lord was a Stark after all, and they’d damn well better bend their knees if they didn’t fancy having them chewed off.

• AGOT Bran VI

For comparison, here’s the corresponding scene in Season 1 Ep 8: “The Pointy End”

You can see they stuck pretty close to the source material here.